From: Peter Chen Date: Tue, 11 Aug 2020 02:00:26 +0000 (+0800) Subject: usb: gadget: core: do not try to disconnect gadget if it is not connected X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5a1da544e572f58986d7bee03d31c91d1f87f214;p=linux.git usb: gadget: core: do not try to disconnect gadget if it is not connected Current UDC core connects gadget during the loading gadget flow (udc_bind_to_driver->usb_udc_connect_control), but for platforms which do not connect gadget if the VBUS is not there, they call usb_gadget_disconnect, but the gadget is not connected at this time, notify disconnecton for the gadget driver is meaningless at this situation. Signed-off-by: Peter Chen Signed-off-by: Felipe Balbi --- diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c index bf1b0efcfaac9..debf54205d22e 100644 --- a/drivers/usb/gadget/udc/core.c +++ b/drivers/usb/gadget/udc/core.c @@ -715,6 +715,9 @@ int usb_gadget_disconnect(struct usb_gadget *gadget) goto out; } + if (!gadget->connected) + goto out; + if (gadget->deactivated) { /* * If gadget is deactivated we only save new state.