6 files changed, 7 insertions, 0 deletions

diff --git a/drivers/usb/gadget/amd5536udc.c b/drivers/usb/gadget/amd5536udc.c
index 66e10da8a490..b663f23f2642 100644
--- a/drivers/usb/gadget/amd5536udc.c
+++ b/drivers/usb/gadget/amd5536udc.c
@@ -2038,6 +2038,7 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
         spin_unlock_irqrestore(&dev->lock, flags);
 
         driver->unbind(&dev->gadget);
+        dev->gadget.dev.driver = NULL;
         dev->driver = NULL;
 
         /* set SD */
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index cd62b029d176..4b6ed353ae36 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -1616,6 +1616,8 @@ int usb_gadget_unregister_driver (struct usb_gadget_driver *driver)
         local_irq_enable();
 
         driver->unbind(&udc->gadget);
+        udc->gadget.dev.driver = NULL;
+        udc->gadget.dev.driver_data = NULL;
         udc->driver = NULL;
 
         DBG("unbound from %s\n", driver->driver.name);
diff --git a/drivers/usb/gadget/goku_udc.c b/drivers/usb/gadget/goku_udc.c
index 2ec9d196a8cf..d3e702576de6 100644
--- a/drivers/usb/gadget/goku_udc.c
+++ b/drivers/usb/gadget/goku_udc.c
@@ -1422,6 +1422,7 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
         spin_unlock_irqrestore(&dev->lock, flags);
 
         driver->unbind(&dev->gadget);
+        dev->gadget.dev.driver = NULL;
 
         DBG(dev, "unregistered driver '%s'\n", driver->driver.name);
         return 0;
diff --git a/drivers/usb/gadget/lh7a40x_udc.c b/drivers/usb/gadget/lh7a40x_udc.c
index 367b75c0b25b..37243ef7104e 100644
--- a/drivers/usb/gadget/lh7a40x_udc.c
+++ b/drivers/usb/gadget/lh7a40x_udc.c
@@ -474,6 +474,7 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
         spin_unlock_irqrestore(&dev->lock, flags);
 
         driver->unbind(&dev->gadget);
+        dev->gadget.dev.driver = NULL;
         device_del(&dev->gadget.dev);
 
         udc_disable(dev);
diff --git a/drivers/usb/gadget/m66592-udc.c b/drivers/usb/gadget/m66592-udc.c
index 43f02189dc44..835948f0715a 100644
--- a/drivers/usb/gadget/m66592-udc.c
+++ b/drivers/usb/gadget/m66592-udc.c
@@ -1508,6 +1508,7 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
         m66592_bclr(m66592, M66592_VBSE | M66592_URST, M66592_INTENB0);
 
         driver->unbind(&m66592->gadget);
+        m66592->gadget.dev.driver = NULL;
 
         init_controller(m66592);
         disable_controller(m66592);
diff --git a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa2xx_udc.c
index 8c139d416ac4..4abf9d26d615 100644
--- a/drivers/usb/gadget/pxa2xx_udc.c
+++ b/drivers/usb/gadget/pxa2xx_udc.c
@@ -1345,6 +1345,7 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
         local_irq_enable();
 
         driver->unbind(&dev->gadget);
+        dev->gadget.dev.driver = NULL;
         dev->driver = NULL;
 
         device_del (&dev->gadget.dev);