Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / drivers / usb / gadget / udc / s3c-hsudc.c

diff --git a/drivers/usb/gadget/udc/s3c-hsudc.c b/drivers/usb/gadget/udc/s3c-hsudc.c
index 712e569bcbd96d0818f0117426390de0e7f49914..85a712a033439b5cb3ac1fa16646049051581304 100644 (file)
--- a/drivers/usb/gadget/udc/s3c-hsudc.c
+++ b/drivers/usb/gadget/udc/s3c-hsudc.c
@@ -1172,8 +1172,6 @@ static int s3c_hsudc_start(struct usb_gadget *gadget,
        }
 
        enable_irq(hsudc->irq);
-       dev_info(hsudc->dev, "bound driver %s\n", driver->driver.name);
-
        s3c_hsudc_reconfig(hsudc);
 
        pm_runtime_get_sync(hsudc->dev);
@@ -1190,8 +1188,7 @@ err_supplies:
        return ret;
 }
 
-static int s3c_hsudc_stop(struct usb_gadget *gadget,
-               struct usb_gadget_driver *driver)
+static int s3c_hsudc_stop(struct usb_gadget *gadget)
 {
        struct s3c_hsudc *hsudc = to_hsudc(gadget);
        unsigned long flags;
@@ -1199,11 +1196,7 @@ static int s3c_hsudc_stop(struct usb_gadget *gadget,
        if (!hsudc)
                return -ENODEV;
 
-       if (!driver || driver != hsudc->driver)
-               return -EINVAL;
-
        spin_lock_irqsave(&hsudc->lock, flags);
-       hsudc->driver = NULL;
        hsudc->gadget.speed = USB_SPEED_UNKNOWN;
        s3c_hsudc_uninit_phy();
 
@@ -1220,9 +1213,8 @@ static int s3c_hsudc_stop(struct usb_gadget *gadget,
        disable_irq(hsudc->irq);
 
        regulator_bulk_disable(ARRAY_SIZE(hsudc->supplies), hsudc->supplies);
+       hsudc->driver = NULL;
 
-       dev_info(hsudc->dev, "unregistered gadget driver '%s'\n",
-                       driver->driver.name);
        return 0;
 }
 
@@ -1267,10 +1259,8 @@ static int s3c_hsudc_probe(struct platform_device *pdev)
        hsudc = devm_kzalloc(&pdev->dev, sizeof(struct s3c_hsudc) +
                        sizeof(struct s3c_hsudc_ep) * pd->epnum,
                        GFP_KERNEL);
-       if (!hsudc) {
-               dev_err(dev, "cannot allocate memory\n");
+       if (!hsudc)
                return -ENOMEM;
-       }
 
        platform_set_drvdata(pdev, dev);
        hsudc->dev = dev;