Skip to content

Commit 30d09b3

Browse files
aakoskingregkh
authored andcommitted
usb: gadget: udc: do not clear gadget driver.bus
Before the commit fc274c1 ("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: fc274c1 ("USB: gadget: Add a new bus for gadgets") Cc: stable <[email protected]> Signed-off-by: Aaro Koskinen <[email protected]> Acked-by: Alan Stern <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 2fa8945 commit 30d09b3

16 files changed

+0
-16
lines changed

drivers/usb/fotg210/fotg210-udc.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1014,7 +1014,6 @@ static int fotg210_udc_start(struct usb_gadget *g,
10141014
int ret;
10151015

10161016
/* hook up the driver */
1017-
driver->driver.bus = NULL;
10181017
fotg210->driver = driver;
10191018

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

drivers/usb/gadget/udc/bcm63xx_udc.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1830,7 +1830,6 @@ static int bcm63xx_udc_start(struct usb_gadget *gadget,
18301830
bcm63xx_select_phy_mode(udc, true);
18311831

18321832
udc->driver = driver;
1833-
driver->driver.bus = NULL;
18341833
udc->gadget.dev.of_node = udc->dev->of_node;
18351834

18361835
spin_unlock_irqrestore(&udc->lock, flags);

drivers/usb/gadget/udc/fsl_qe_udc.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2285,7 +2285,6 @@ static int fsl_qe_start(struct usb_gadget *gadget,
22852285
/* lock is needed but whether should use this lock or another */
22862286
spin_lock_irqsave(&udc->lock, flags);
22872287

2288-
driver->driver.bus = NULL;
22892288
/* hook up the driver */
22902289
udc->driver = driver;
22912290
udc->gadget.speed = driver->max_speed;

drivers/usb/gadget/udc/fsl_udc_core.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1943,7 +1943,6 @@ static int fsl_udc_start(struct usb_gadget *g,
19431943
/* lock is needed but whether should use this lock or another */
19441944
spin_lock_irqsave(&udc_controller->lock, flags);
19451945

1946-
driver->driver.bus = NULL;
19471946
/* hook up the driver */
19481947
udc_controller->driver = driver;
19491948
spin_unlock_irqrestore(&udc_controller->lock, flags);

drivers/usb/gadget/udc/fusb300_udc.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1311,7 +1311,6 @@ static int fusb300_udc_start(struct usb_gadget *g,
13111311
struct fusb300 *fusb300 = to_fusb300(g);
13121312

13131313
/* hook up the driver */
1314-
driver->driver.bus = NULL;
13151314
fusb300->driver = driver;
13161315

13171316
return 0;

drivers/usb/gadget/udc/goku_udc.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1375,7 +1375,6 @@ static int goku_udc_start(struct usb_gadget *g,
13751375
struct goku_udc *dev = to_goku_udc(g);
13761376

13771377
/* hook up the driver */
1378-
driver->driver.bus = NULL;
13791378
dev->driver = driver;
13801379

13811380
/*

drivers/usb/gadget/udc/gr_udc.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1906,7 +1906,6 @@ static int gr_udc_start(struct usb_gadget *gadget,
19061906
spin_lock(&dev->lock);
19071907

19081908
/* Hook up the driver */
1909-
driver->driver.bus = NULL;
19101909
dev->driver = driver;
19111910

19121911
/* Get ready for host detection */

drivers/usb/gadget/udc/m66592-udc.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1454,7 +1454,6 @@ static int m66592_udc_start(struct usb_gadget *g,
14541454
struct m66592 *m66592 = to_m66592(g);
14551455

14561456
/* hook up the driver */
1457-
driver->driver.bus = NULL;
14581457
m66592->driver = driver;
14591458

14601459
m66592_bset(m66592, M66592_VBSE | M66592_URST, M66592_INTENB0);

drivers/usb/gadget/udc/max3420_udc.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1108,7 +1108,6 @@ static int max3420_udc_start(struct usb_gadget *gadget,
11081108

11091109
spin_lock_irqsave(&udc->lock, flags);
11101110
/* hook up the driver */
1111-
driver->driver.bus = NULL;
11121111
udc->driver = driver;
11131112
udc->gadget.speed = USB_SPEED_FULL;
11141113

drivers/usb/gadget/udc/mv_u3d_core.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1243,7 +1243,6 @@ static int mv_u3d_start(struct usb_gadget *g,
12431243
}
12441244

12451245
/* hook up the driver ... */
1246-
driver->driver.bus = NULL;
12471246
u3d->driver = driver;
12481247

12491248
u3d->ep0_dir = USB_DIR_OUT;

0 commit comments

Comments
 (0)