]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
usb: musb: fix gadget state on disconnect
authorDrew Hamilton <drew.hamilton@zetier.com>
Tue, 1 Jul 2025 15:41:26 +0000 (11:41 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 7 Jul 2025 08:58:15 +0000 (10:58 +0200)
When unplugging the USB cable or disconnecting a gadget in usb peripheral mode with
echo "" > /sys/kernel/config/usb_gadget/<your_gadget>/UDC,
/sys/class/udc/musb-hdrc.0/state does not change from USB_STATE_CONFIGURED.

Testing on dwc2/3 shows they both update the state to USB_STATE_NOTATTACHED.

Add calls to usb_gadget_set_state in musb_g_disconnect and musb_gadget_stop
to fix both cases.

Fixes: 49401f4169c0 ("usb: gadget: introduce gadget state tracking")
Cc: stable@vger.kernel.org
Co-authored-by: Yehowshua Immanuel <yehowshua.immanuel@twosixtech.com>
Signed-off-by: Yehowshua Immanuel <yehowshua.immanuel@twosixtech.com>
Signed-off-by: Drew Hamilton <drew.hamilton@zetier.com>
Link: https://lore.kernel.org/r/20250701154126.8543-1-drew.hamilton@zetier.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/musb/musb_gadget.c

index 6869c58367f2d05b464a0f9a63008425730b94da..caf4d4cd4b75b88b85aa0ca20f8f34856202c6c4 100644 (file)
@@ -1913,6 +1913,7 @@ static int musb_gadget_stop(struct usb_gadget *g)
         * gadget driver here and have everything work;
         * that currently misbehaves.
         */
+       usb_gadget_set_state(g, USB_STATE_NOTATTACHED);
 
        /* Force check of devctl register for PM runtime */
        pm_runtime_mark_last_busy(musb->controller);
@@ -2019,6 +2020,7 @@ void musb_g_disconnect(struct musb *musb)
        case OTG_STATE_B_PERIPHERAL:
        case OTG_STATE_B_IDLE:
                musb_set_state(musb, OTG_STATE_B_IDLE);
+               usb_gadget_set_state(&musb->g, USB_STATE_NOTATTACHED);
                break;
        case OTG_STATE_B_SRP_INIT:
                break;