Commit 67a59f82 authored by Drew Hamilton's avatar Drew Hamilton Committed by Greg Kroah-Hartman
Browse files

usb: musb: fix gadget state on disconnect 



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: 49401f41 ("usb: gadget: introduce gadget state tracking")
Cc: stable@vger.kernel.org
Co-authored-by: default avatarYehowshua Immanuel <yehowshua.immanuel@twosixtech.com>
Signed-off-by: default avatarYehowshua Immanuel <yehowshua.immanuel@twosixtech.com>
Signed-off-by: default avatarDrew Hamilton <drew.hamilton@zetier.com>
Link: https://lore.kernel.org/r/20250701154126.8543-1-drew.hamilton@zetier.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9fccced2

drivers/usb/musb/musb_gadget.c

+2 −0
Original line number Diff line number Diff line
@@ -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;