From 2477aa4dd63d241983ed9828c7384970027892c2 Mon Sep 17 00:00:00 2001 From: Rohith Seelaboyina Date: Tue, 28 Jan 2014 11:59:35 +0530 Subject: usb: gadget: tegra: check ep->desc before access This changes adds condition to check ep->desc before accessing its contents. ep->desc seems to get Null on releasing the spin_lock. Bug 1401730 Change-Id: I48b4c880ced0cd131bd45840839e6635fc1a219c Signed-off-by: Rohith Seelaboyina Reviewed-on: http://git-master/r/362353 (cherry picked from commit 790be48ddf070df3e6357b4e290d8fb4c603a34e) Reviewed-on: http://git-master/r/363103 Reviewed-by: Harry Hong Tested-by: Harry Hong --- drivers/usb/gadget/tegra_udc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/gadget/tegra_udc.c b/drivers/usb/gadget/tegra_udc.c index 6bcf279f9855..86e40fde62bb 100644 --- a/drivers/usb/gadget/tegra_udc.c +++ b/drivers/usb/gadget/tegra_udc.c @@ -1135,7 +1135,7 @@ static int tegra_ep_dequeue(struct usb_ep *_ep, struct usb_request *_req) /* Enable EP */ out: /* Touch the registers if cable is connected and phy is on */ - if (udc->vbus_active) { + if (udc->vbus_active && ep->desc) { epctrl = udc_readl(udc, EP_CONTROL_REG_OFFSET + (ep_num * 4)); if (ep_is_in(ep)) epctrl |= EPCTRL_TX_ENABLE; -- cgit v1.2.3