diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-29 18:43:16 +0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-29 18:43:16 +0400 |
commit | 78283dd29e647775cb1e63a4d6554b3090b9a9ff (patch) | |
tree | 46a179781ed356c0546379ecc46ca5daed7ae50a /drivers/usb/dwc3/gadget.c | |
parent | 435932f2c75efcdd07273a437b9be32647d56d73 (diff) | |
parent | 5ae90d8e467e625e447000cb4335c4db973b1095 (diff) | |
download | linux-78283dd29e647775cb1e63a4d6554b3090b9a9ff.tar.xz |
Merge 3.11-rc3 into usb-next
Diffstat (limited to 'drivers/usb/dwc3/gadget.c')
-rw-r--r-- | drivers/usb/dwc3/gadget.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index b5e5b35df49c..f77083fedc68 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -1584,6 +1584,7 @@ err1: __dwc3_gadget_ep_disable(dwc->eps[0]); err0: + dwc->gadget_driver = NULL; spin_unlock_irqrestore(&dwc->lock, flags); return ret; |