summaryrefslogtreecommitdiff
path: root/drivers/usb/gadget/tegra_udc.c
diff options
context:
space:
mode:
authorRohith Seelaboyina <rseelaboyina@nvidia.com>2014-01-28 11:59:35 +0530
committerRohith Seelaboyina <rseelaboyina@nvidia.com>2014-02-09 20:56:59 -0800
commita30ec742c59178ec94be7fe7f9ac2b0149abff88 (patch)
tree423ee45d03f96cd01488aa5f4f77bae9a208708c /drivers/usb/gadget/tegra_udc.c
parent35f21ec543e53a43bf3a90b4f26915eeec692a0c (diff)
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 <rseelaboyina@nvidia.com> Reviewed-on: http://git-master/r/362366 (cherry picked from commit 4c18848a52973987a691a871c127e54d697c60dc) Reviewed-on: http://git-master/r/362368 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
Diffstat (limited to 'drivers/usb/gadget/tegra_udc.c')
-rw-r--r--drivers/usb/gadget/tegra_udc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/tegra_udc.c b/drivers/usb/gadget/tegra_udc.c
index 90108ce4ab46..fbc8c3f8b8c5 100644
--- a/drivers/usb/gadget/tegra_udc.c
+++ b/drivers/usb/gadget/tegra_udc.c
@@ -1144,7 +1144,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;