1 files changed, 21 insertions, 15 deletions

diff --git a/drivers/usb/gadget/goku_udc.c b/drivers/usb/gadget/goku_udc.c
index 1088d08c7ed8..bf6e11c758d5 100644
--- a/drivers/usb/gadget/goku_udc.c
+++ b/drivers/usb/gadget/goku_udc.c
@@ -38,6 +38,7 @@
 #include <linux/device.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
+#include <linux/prefetch.h>
 
 #include <asm/byteorder.h>
 #include <asm/io.h>
@@ -1343,14 +1344,15 @@ static struct goku_udc	*the_controller;
  * disconnect is reported.  then a host may connect again, or
  * the driver might get unbound.
  */
-int usb_gadget_register_driver(struct usb_gadget_driver *driver)
+int usb_gadget_probe_driver(struct usb_gadget_driver *driver,
+                int (*bind)(struct usb_gadget *))
 {
         struct goku_udc *dev = the_controller;
         int                     retval;
 
         if (!driver
                         || driver->speed < USB_SPEED_FULL
-                        || !driver->bind
+                        || !bind
                         || !driver->disconnect
                         || !driver->setup)
                 return -EINVAL;
@@ -1363,7 +1365,7 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)
         driver->driver.bus = NULL;
         dev->driver = driver;
         dev->gadget.dev.driver = &driver->driver;
-        retval = driver->bind(&dev->gadget);
+        retval = bind(&dev->gadget);
         if (retval) {
                 DBG(dev, "bind to driver %s --> error %d\n",
                                 driver->driver.name, retval);
@@ -1380,7 +1382,7 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)
         DBG(dev, "registered gadget driver '%s'\n", driver->driver.name);
         return 0;
 }
-EXPORT_SYMBOL(usb_gadget_register_driver);
+EXPORT_SYMBOL(usb_gadget_probe_driver);
 
 static void
 stop_activity(struct goku_udc *dev, struct usb_gadget_driver *driver)
@@ -1744,7 +1746,8 @@ static void goku_remove(struct pci_dev *pdev)
                                 pci_resource_len (pdev, 0));
         if (dev->enabled)
                 pci_disable_device(pdev);
-        device_unregister(&dev->gadget.dev);
+        if (dev->registered)
+                device_unregister(&dev->gadget.dev);
 
         pci_set_drvdata(pdev, NULL);
         dev->regs = NULL;
@@ -1774,7 +1777,7 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         if (!pdev->irq) {
                 printk(KERN_ERR "Check PCI %s IRQ setup!\n", pci_name(pdev));
                 retval = -ENODEV;
-                goto done;
+                goto err;
         }
 
         /* alloc, and start init */
@@ -1782,7 +1785,7 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         if (dev == NULL){
                 pr_debug("enomem %s\n", pci_name(pdev));
                 retval = -ENOMEM;
-                goto done;
+                goto err;
         }
 
         spin_lock_init(&dev->lock);
@@ -1800,7 +1803,7 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         retval = pci_enable_device(pdev);
         if (retval < 0) {
                 DBG(dev, "can't enable, %d\n", retval);
-                goto done;
+                goto err;
         }
         dev->enabled = 1;
 
@@ -1809,7 +1812,7 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         if (!request_mem_region(resource, len, driver_name)) {
                 DBG(dev, "controller already in use\n");
                 retval = -EBUSY;
-                goto done;
+                goto err;
         }
         dev->got_region = 1;
 
@@ -1817,7 +1820,7 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         if (base == NULL) {
                 DBG(dev, "can't map memory\n");
                 retval = -EFAULT;
-                goto done;
+                goto err;
         }
         dev->regs = (struct goku_udc_regs __iomem *) base;
 
@@ -1833,7 +1836,7 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                         driver_name, dev) != 0) {
                 DBG(dev, "request interrupt %d failed\n", pdev->irq);
                 retval = -EBUSY;
-                goto done;
+                goto err;
         }
         dev->got_irq = 1;
         if (use_dma)
@@ -1844,13 +1847,16 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         create_proc_read_entry(proc_node_name, 0, NULL, udc_proc_read, dev);
 #endif
 
-        /* done */
         the_controller = dev;
         retval = device_register(&dev->gadget.dev);
-        if (retval == 0)
-                return 0;
+        if (retval) {
+                put_device(&dev->gadget.dev);
+                goto err;
+        }
+        dev->registered = 1;
+        return 0;
 
-done:
+err:
         if (dev)
                 goku_remove (pdev);
         return retval;