1 files changed, 1 insertions, 8 deletions

diff --git a/drivers/usb/gadget/amd5536udc.c b/drivers/usb/gadget/amd5536udc.c
index 75973f33a4c8..eee01ea70f8c 100644
--- a/drivers/usb/gadget/amd5536udc.c
+++ b/drivers/usb/gadget/amd5536udc.c
@@ -3080,7 +3080,6 @@ static void udc_pci_remove(struct pci_dev *pdev)
         if (dev->active)
                 pci_disable_device(pdev);
 
-        device_unregister(&dev->gadget.dev);
         pci_set_drvdata(pdev, NULL);
 
         udc_remove(dev);
@@ -3276,6 +3275,7 @@ static int udc_probe(struct udc *dev)
         dev->gadget.dev.release = gadget_release;
         dev->gadget.name = name;
         dev->gadget.max_speed = USB_SPEED_HIGH;
+        dev->gadget.register_my_device = true;
 
         /* init registers, interrupts, ... */
         startup_registers(dev);
@@ -3301,13 +3301,6 @@ static int udc_probe(struct udc *dev)
         if (retval)
                 goto finished;
 
-        retval = device_register(&dev->gadget.dev);
-        if (retval) {
-                usb_del_gadget_udc(&dev->gadget);
-                put_device(&dev->gadget.dev);
-                goto finished;
-        }
-
         /* timer init */
         init_timer(&udc_timer);
         udc_timer.function = udc_timer_function;