1 files changed, 8 insertions, 5 deletions

diff --git a/drivers/usb/gadget/lh7a40x_udc.c b/drivers/usb/gadget/lh7a40x_udc.c
index 4a991564a03e..a0a73c08a344 100644
--- a/drivers/usb/gadget/lh7a40x_udc.c
+++ b/drivers/usb/gadget/lh7a40x_udc.c
@@ -422,9 +422,10 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)
         DEBUG("%s: %s\n", __FUNCTION__, driver->driver.name);
 
         if (!driver
-            || driver->speed != USB_SPEED_FULL
-            || !driver->bind
-            || !driver->unbind || !driver->disconnect || !driver->setup)
+                        || driver->speed != USB_SPEED_FULL
+                        || !driver->bind
+                        || !driver->disconnect
+                        || !driver->setup)
                 return -EINVAL;
         if (!dev)
                 return -ENODEV;
@@ -471,7 +472,7 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
 
         if (!dev)
                 return -ENODEV;
-        if (!driver || driver != dev->driver)
+        if (!driver || driver != dev->driver || !driver->unbind)
                 return -EINVAL;
 
         spin_lock_irqsave(&dev->lock, flags);
@@ -2125,9 +2126,11 @@ static int lh7a40x_udc_remove(struct platform_device *pdev)
 
         DEBUG("%s: %p\n", __FUNCTION__, pdev);
 
+        if (dev->driver)
+                return -EBUSY;
+
         udc_disable(dev);
         remove_proc_files();
-        usb_gadget_unregister_driver(dev->driver);
 
         free_irq(IRQ_USBINTR, dev);