diff options
author | Marek Szyprowski <m.szyprowski@samsung.com> | 2014-09-09 10:44:11 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-09 19:17:48 +0200 |
commit | b510df5a36c066da3a188f4ade3404118b63c6de (patch) | |
tree | fd33cd807199491bc9df7c94be897705b1aef461 /drivers/usb/dwc2 | |
parent | usb: dwc2/gadget: break infinite loop in endpoint disable code (diff) | |
download | linux-b510df5a36c066da3a188f4ade3404118b63c6de.tar.xz linux-b510df5a36c066da3a188f4ade3404118b63c6de.zip |
usb: dwc2/gadget: do not call disconnect method in pullup
This leads to potential spinlock recursion in composite framework, other
udc drivers also don't call it directly from pullup method.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
Cc: stable <stable@vger.kernel.org> # 3.16
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/dwc2')
-rw-r--r-- | drivers/usb/dwc2/gadget.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c index a451eef48c9d..474eae2e1692 100644 --- a/drivers/usb/dwc2/gadget.c +++ b/drivers/usb/dwc2/gadget.c @@ -2942,7 +2942,6 @@ static int s3c_hsotg_pullup(struct usb_gadget *gadget, int is_on) s3c_hsotg_phy_enable(hsotg); s3c_hsotg_core_init(hsotg); } else { - s3c_hsotg_disconnect(hsotg); s3c_hsotg_phy_disable(hsotg); } |