Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd3923a9 authored by Apelete Seketeli's avatar Apelete Seketeli Committed by Felipe Balbi
Browse files

usb: fix musb gadget to enable OTG mode conditionally 



The musb driver is usable in host, gadget or dual role mode depending
on the kernel configuration.

However, the musb gadget part of the driver is enabling OTG mode
whether the driver is built for dual role or gadget only mode. This
induces a bug for gadget only USB device controllers where the kernel
tries to use Host Negotiation Protocol with such controllers, which
causes a panic.

This behaviour is now fixed by enabling OTG mode only when musb driver
is built for dual role mode.

Signed-off-by: default avatarApelete Seketeli <apelete@seketeli.net>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent b144e4ab

drivers/usb/musb/musb_gadget.c

+4 −0
Original line number Diff line number Diff line
@@ -1796,7 +1796,11 @@ int musb_gadget_setup(struct musb *musb) 


	/* this "gadget" abstracts/virtualizes the controller */

	musb->g.name = musb_driver_name;

#if IS_ENABLED(CONFIG_USB_MUSB_DUAL_ROLE)

	musb->g.is_otg = 1;

#elif IS_ENABLED(CONFIG_USB_MUSB_GADGET)

	musb->g.is_otg = 0;

#endif



	musb_g_init_endpoints(musb);