From: Benjamin Herrenschmidt Date: Fri, 26 Jul 2019 04:59:03 +0000 (+1000) Subject: usb: gadget: composite: Clear "suspended" on reset/disconnect X-Git-Tag: v4.9.191~37 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d023765893154158b590ca94f5f5e11df857c9a7;p=platform%2Fkernel%2Flinux-amlogic.git usb: gadget: composite: Clear "suspended" on reset/disconnect [ Upstream commit 602fda17c7356bb7ae98467d93549057481d11dd ] In some cases, one can get out of suspend with a reset or a disconnect followed by a reconnect. Previously we would leave a stale suspended flag set. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Felipe Balbi Signed-off-by: Sasha Levin --- diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index 2c022a08f163..9fa168af847b 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -2000,6 +2000,7 @@ void composite_disconnect(struct usb_gadget *gadget) * disconnect callbacks? */ spin_lock_irqsave(&cdev->lock, flags); + cdev->suspended = 0; if (cdev->config) reset_config(cdev); if (cdev->driver->disconnect)