1 files changed, 1 insertions, 13 deletions

diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index 45dd2929a671..a690d64217f4 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -1631,7 +1631,6 @@ static int at91_start(struct usb_gadget *gadget,
 
         udc = container_of(gadget, struct at91_udc, gadget);
         udc->driver = driver;
-        udc->gadget.dev.driver = &driver->driver;
         udc->gadget.dev.of_node = udc->pdev->dev.of_node;
         udc->enabled = 1;
         udc->selfpowered = 1;
@@ -1652,7 +1651,6 @@ static int at91_stop(struct usb_gadget *gadget,
         at91_udp_write(udc, AT91_UDP_IDR, ~0);
         spin_unlock_irqrestore(&udc->lock, flags);
 
-        udc->gadget.dev.driver = NULL;
         udc->driver = NULL;
 
         DBG("unbound from %s\n", driver->driver.name);
@@ -1780,13 +1778,7 @@ static int at91udc_probe(struct platform_device *pdev)
                 DBG("clocks missing\n");
                 retval = -ENODEV;
                 /* NOTE: we "know" here that refcounts on these are NOPs */
-                goto fail0b;
-        }
-
-        retval = device_register(&udc->gadget.dev);
-        if (retval < 0) {
-                put_device(&udc->gadget.dev);
-                goto fail0b;
+                goto fail1;
         }
 
         /* don't do anything until we have both gadget driver and VBUS */
@@ -1857,8 +1849,6 @@ fail3:
 fail2:
         free_irq(udc->udp_irq, udc);
 fail1:
-        device_unregister(&udc->gadget.dev);
-fail0b:
         iounmap(udc->udp_baseaddr);
 fail0a:
         if (cpu_is_at91rm9200())
@@ -1892,8 +1882,6 @@ static int __exit at91udc_remove(struct platform_device *pdev)
                 gpio_free(udc->board.vbus_pin);
         }
         free_irq(udc->udp_irq, udc);
-        device_unregister(&udc->gadget.dev);
-
         iounmap(udc->udp_baseaddr);
 
         if (cpu_is_at91rm9200())