Commit 30d09b31 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

usb: gadget: udc: do not clear gadget driver.bus 



Before the commit fc274c1e ("USB: gadget: Add a new bus for gadgets")
gadget driver.bus was unused. For whatever reason, many UDC drivers set
this field explicitly to NULL in udc_start(). With the newly added gadget
bus, doing this will crash the driver during the attach.

The problem was first reported, fixed and tested with OMAP UDC and g_ether.
Other drivers are changed based on code analysis only.

Fixes: fc274c1e ("USB: gadget: Add a new bus for gadgets")
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Link: https://lore.kernel.org/r/20230201220125.GD2415@darkstar.musicnaut.iki.fi


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

drivers/usb/fotg210/fotg210-udc.c

+0 −1
Original line number Diff line number Diff line
@@ -1014,7 +1014,6 @@ static int fotg210_udc_start(struct usb_gadget *g, 
	int ret;



	/* hook up the driver */

	driver->driver.bus = NULL;

	fotg210->driver = driver;



	if (!IS_ERR_OR_NULL(fotg210->phy)) {

drivers/usb/gadget/udc/bcm63xx_udc.c

+0 −1
Original line number Diff line number Diff line
@@ -1830,7 +1830,6 @@ static int bcm63xx_udc_start(struct usb_gadget *gadget, 
	bcm63xx_select_phy_mode(udc, true);



	udc->driver = driver;

	driver->driver.bus = NULL;

	udc->gadget.dev.of_node = udc->dev->of_node;



	spin_unlock_irqrestore(&udc->lock, flags);

drivers/usb/gadget/udc/fsl_qe_udc.c

+0 −1
Original line number Diff line number Diff line
@@ -2285,7 +2285,6 @@ static int fsl_qe_start(struct usb_gadget *gadget, 
	/* lock is needed but whether should use this lock or another */

	spin_lock_irqsave(&udc->lock, flags);



	driver->driver.bus = NULL;

	/* hook up the driver */

	udc->driver = driver;

	udc->gadget.speed = driver->max_speed;

drivers/usb/gadget/udc/fsl_udc_core.c

+0 −1
Original line number Diff line number Diff line
@@ -1943,7 +1943,6 @@ static int fsl_udc_start(struct usb_gadget *g, 
	/* lock is needed but whether should use this lock or another */

	spin_lock_irqsave(&udc_controller->lock, flags);



	driver->driver.bus = NULL;

	/* hook up the driver */

	udc_controller->driver = driver;

	spin_unlock_irqrestore(&udc_controller->lock, flags);

drivers/usb/gadget/udc/fusb300_udc.c

+0 −1
Original line number Diff line number Diff line
@@ -1311,7 +1311,6 @@ static int fusb300_udc_start(struct usb_gadget *g, 
	struct fusb300 *fusb300 = to_fusb300(g);



	/* hook up the driver */

	driver->driver.bus = NULL;

	fusb300->driver = driver;



	return 0;