]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
usb: dwc2/gadget: do not call disconnect method in pullup
authorMarek Szyprowski <m.szyprowski@samsung.com>
Tue, 9 Sep 2014 08:44:11 +0000 (10:44 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 5 Oct 2014 20:40:59 +0000 (13:40 -0700)
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>
drivers/usb/dwc2/gadget.c

index f3198dc9937aa035591304ad8305bef917ffde4f..1c2b8dd97786f33bcef21672e7e7dca61d40c524 100644 (file)
@@ -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);
        }