summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMarek Szyprowski <m.szyprowski@samsung.com>2014-09-09 10:44:11 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-10-05 13:40:59 -0700
commit5294e5fe70646dc7d5b82f5f631f564bb6fbb82f (patch)
treee3395a74b25ac1146275a1c0d29ee7a0d4ed8c24 /drivers
parenta5e10292faafb9a6f470d2be42a7479cef2402a2 (diff)
usb: dwc2/gadget: do not call disconnect method in pullup
commit b510df5a36c066da3a188f4ade3404118b63c6de upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/dwc2/gadget.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index f3198dc9937a..1c2b8dd97786 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -2943,7 +2943,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);
}