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

commit 30d09b3131f5b1b9d54ad9b7ee171a45e21362b3 upstream.

Before the commit fc274c1e9973 ("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: fc274c1e9973 ("USB: gadget: Add a new bus for gadgets")
Cc: stable <stable@kernel.org>
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Link: https://lore.kernel.org/r/20230201220125.GD2415@darkstar.musicnaut.iki.fi
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/gadget/udc/bcm63xx_udc.c b/drivers/usb/gadget/udc/bcm63xx_udc.c
index 2cdb07905bdebee0120c0c8b35992be1c6fea349..d04d72f5816e61edede507aacf8544c4cfe0e6fa 100644 (file)
--- a/drivers/usb/gadget/udc/bcm63xx_udc.c
+++ b/drivers/usb/gadget/udc/bcm63xx_udc.c
@@ -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);

diff --git a/drivers/usb/gadget/udc/fotg210-udc.c b/drivers/usb/gadget/udc/fotg210-udc.c
index d0e051beb3af95fadd3b8d2e2ce333986f24e2fc..693c73e5f61e8919c545fbdced5272c57a38c95a 100644 (file)
--- a/drivers/usb/gadget/udc/fotg210-udc.c
+++ b/drivers/usb/gadget/udc/fotg210-udc.c
@@ -1009,7 +1009,6 @@ static int fotg210_udc_start(struct usb_gadget *g,
        u32 value;
 
        /* hook up the driver */
-       driver->driver.bus = NULL;
        fotg210->driver = driver;
 
        /* enable device global interrupt */

diff --git a/drivers/usb/gadget/udc/fsl_qe_udc.c b/drivers/usb/gadget/udc/fsl_qe_udc.c
index bf745358e28e6b933edb731fd845b9b99081bf2f..3b1cc8fa30c830c980b9c8c3f021b142ebeb3327 100644 (file)
--- a/drivers/usb/gadget/udc/fsl_qe_udc.c
+++ b/drivers/usb/gadget/udc/fsl_qe_udc.c
@@ -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;

diff --git a/drivers/usb/gadget/udc/fsl_udc_core.c b/drivers/usb/gadget/udc/fsl_udc_core.c
index 50435e8041183171c1522eb2552bc100c8de1857..a67873a074b7bc020b30d3c54d39650b9a902c91 100644 (file)
--- a/drivers/usb/gadget/udc/fsl_udc_core.c
+++ b/drivers/usb/gadget/udc/fsl_udc_core.c
@@ -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);

diff --git a/drivers/usb/gadget/udc/fusb300_udc.c b/drivers/usb/gadget/udc/fusb300_udc.c
index 9af8b415f303bbcd1e4f50a64327fa8bd64b3861..5954800d652ca950d6d76d4738fa273f47c4d757 100644 (file)
--- a/drivers/usb/gadget/udc/fusb300_udc.c
+++ b/drivers/usb/gadget/udc/fusb300_udc.c
@@ -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;

diff --git a/drivers/usb/gadget/udc/goku_udc.c b/drivers/usb/gadget/udc/goku_udc.c
index bdc56b24b5c900e1b5aab30dea1bc16dffcd0223..5ffb3d5c635becbfa9bfa275f2471df29d002c57 100644 (file)
--- a/drivers/usb/gadget/udc/goku_udc.c
+++ b/drivers/usb/gadget/udc/goku_udc.c
@@ -1375,7 +1375,6 @@ static int goku_udc_start(struct usb_gadget *g,
        struct goku_udc *dev = to_goku_udc(g);
 
        /* hook up the driver */
-       driver->driver.bus = NULL;
        dev->driver = driver;
 
        /*

diff --git a/drivers/usb/gadget/udc/gr_udc.c b/drivers/usb/gadget/udc/gr_udc.c
index 22096f8505de4a64cb2538f0a096561e89b8de85..85cdc0af3bf952621d80bacab7ed219aa64f0602 100644 (file)
--- a/drivers/usb/gadget/udc/gr_udc.c
+++ b/drivers/usb/gadget/udc/gr_udc.c
@@ -1906,7 +1906,6 @@ static int gr_udc_start(struct usb_gadget *gadget,
        spin_lock(&dev->lock);
 
        /* Hook up the driver */
-       driver->driver.bus = NULL;
        dev->driver = driver;
 
        /* Get ready for host detection */

diff --git a/drivers/usb/gadget/udc/m66592-udc.c b/drivers/usb/gadget/udc/m66592-udc.c
index 931e6362a13dace085b8310d311301f4d91d7c02..d88871e716623db111a34c9f2a597f54fb786b3d 100644 (file)
--- a/drivers/usb/gadget/udc/m66592-udc.c
+++ b/drivers/usb/gadget/udc/m66592-udc.c
@@ -1454,7 +1454,6 @@ static int m66592_udc_start(struct usb_gadget *g,
        struct m66592 *m66592 = to_m66592(g);
 
        /* hook up the driver */
-       driver->driver.bus = NULL;
        m66592->driver = driver;
 
        m66592_bset(m66592, M66592_VBSE | M66592_URST, M66592_INTENB0);

diff --git a/drivers/usb/gadget/udc/max3420_udc.c b/drivers/usb/gadget/udc/max3420_udc.c
index 3074da00c3df76669919e16b95aa8168c4250b18..ddf0ed3eb4f2616fe6c4a5cbe235a66a50210ea7 100644 (file)
--- a/drivers/usb/gadget/udc/max3420_udc.c
+++ b/drivers/usb/gadget/udc/max3420_udc.c
@@ -1108,7 +1108,6 @@ static int max3420_udc_start(struct usb_gadget *gadget,
 
        spin_lock_irqsave(&udc->lock, flags);
        /* hook up the driver */
-       driver->driver.bus = NULL;
        udc->driver = driver;
        udc->gadget.speed = USB_SPEED_FULL;
 

diff --git a/drivers/usb/gadget/udc/mv_u3d_core.c b/drivers/usb/gadget/udc/mv_u3d_core.c
index 598654a3cb4184f4a2e40eb1bec247c71bdacfc7..411b6179782c1d064fff8d9077170c04028a31e6 100644 (file)
--- a/drivers/usb/gadget/udc/mv_u3d_core.c
+++ b/drivers/usb/gadget/udc/mv_u3d_core.c
@@ -1243,7 +1243,6 @@ static int mv_u3d_start(struct usb_gadget *g,
        }
 
        /* hook up the driver ... */
-       driver->driver.bus = NULL;
        u3d->driver = driver;
 
        u3d->ep0_dir = USB_DIR_OUT;

diff --git a/drivers/usb/gadget/udc/mv_udc_core.c b/drivers/usb/gadget/udc/mv_udc_core.c
index fdb17d86cd65603eaeade50a636d0e78a91980dd..b397f3a848cf7ac082dc4296b692bb4df81bd098 100644 (file)
--- a/drivers/usb/gadget/udc/mv_udc_core.c
+++ b/drivers/usb/gadget/udc/mv_udc_core.c
@@ -1359,7 +1359,6 @@ static int mv_udc_start(struct usb_gadget *gadget,
        spin_lock_irqsave(&udc->lock, flags);
 
        /* hook up the driver ... */
-       driver->driver.bus = NULL;
        udc->driver = driver;
 
        udc->usb_state = USB_STATE_ATTACHED;

diff --git a/drivers/usb/gadget/udc/net2272.c b/drivers/usb/gadget/udc/net2272.c
index 84605a4d0715f53e927a800dbc485b8fd0a7da27..538c1b9a2883546fa15ac03cf0ab241b33c22f74 100644 (file)
--- a/drivers/usb/gadget/udc/net2272.c
+++ b/drivers/usb/gadget/udc/net2272.c
@@ -1451,7 +1451,6 @@ static int net2272_start(struct usb_gadget *_gadget,
                dev->ep[i].irqs = 0;
        /* hook up the driver ... */
        dev->softconnect = 1;
-       driver->driver.bus = NULL;
        dev->driver = driver;
 
        /* ... then enable host detection and ep0; and we're ready

diff --git a/drivers/usb/gadget/udc/net2280.c b/drivers/usb/gadget/udc/net2280.c
index d6a68631354a2805c57448952c08a2395f644516..1b929c519cd7126853b9b8487cf814957225cb0c 100644 (file)
--- a/drivers/usb/gadget/udc/net2280.c
+++ b/drivers/usb/gadget/udc/net2280.c
@@ -2423,7 +2423,6 @@ static int net2280_start(struct usb_gadget *_gadget,
                dev->ep[i].irqs = 0;
 
        /* hook up the driver ... */
-       driver->driver.bus = NULL;
        dev->driver = driver;
 
        retval = device_create_file(&dev->pdev->dev, &dev_attr_function);

diff --git a/drivers/usb/gadget/udc/omap_udc.c b/drivers/usb/gadget/udc/omap_udc.c
index bea346e362b2b72df7910c417995d4756aa94927..f660ebfa13799544331fef23be1035ab162aff92 100644 (file)
--- a/drivers/usb/gadget/udc/omap_udc.c
+++ b/drivers/usb/gadget/udc/omap_udc.c
@@ -2066,7 +2066,6 @@ static int omap_udc_start(struct usb_gadget *g,
        udc->softconnect = 1;
 
        /* hook up the driver */
-       driver->driver.bus = NULL;
        udc->driver = driver;
        spin_unlock_irqrestore(&udc->lock, flags);
 

diff --git a/drivers/usb/gadget/udc/pch_udc.c b/drivers/usb/gadget/udc/pch_udc.c
index 9bb7a9d7a2fb245e6039e6254db4077dff4fd998..4f8617210d852643e55a5b8463d0f03b6d9e9c78 100644 (file)
--- a/drivers/usb/gadget/udc/pch_udc.c
+++ b/drivers/usb/gadget/udc/pch_udc.c
@@ -2908,7 +2908,6 @@ static int pch_udc_start(struct usb_gadget *g,
 {
        struct pch_udc_dev      *dev = to_pch_udc(g);
 
-       driver->driver.bus = NULL;
        dev->driver = driver;
 
        /* get ready for ep0 traffic */

diff --git a/drivers/usb/gadget/udc/snps_udc_core.c b/drivers/usb/gadget/udc/snps_udc_core.c
index 52ea4dcf6a9275eb05082a8bb97ac4681b5bd80d..2fc5d4d277bc4a594f3ed883a0b2398712347334 100644 (file)
--- a/drivers/usb/gadget/udc/snps_udc_core.c
+++ b/drivers/usb/gadget/udc/snps_udc_core.c
@@ -1933,7 +1933,6 @@ static int amd5536_udc_start(struct usb_gadget *g,
        struct udc *dev = to_amd5536_udc(g);
        u32 tmp;
 
-       driver->driver.bus = NULL;
        dev->driver = driver;
 
        /* Some gadget drivers use both ep0 directions.