diff options
| author | Marek Szyprowski <m.szyprowski@samsung.com> | 2013-08-13 12:59:10 +0200 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-11-18 11:44:43 +0900 |
| commit | 4672bd70cfdd7f31fe40b43623fc104b807a9177 (patch) | |
| tree | d422b1ba0a66270edc92b1886a83b55bd22b9f4b /drivers/usb | |
| parent | 54905f3f1bcbba842e37fab4bbf08d2cf0c7a0da (diff) | |
| download | linux-3.10-4672bd70cfdd7f31fe40b43623fc104b807a9177.tar.gz linux-3.10-4672bd70cfdd7f31fe40b43623fc104b807a9177.tar.bz2 linux-3.10-4672bd70cfdd7f31fe40b43623fc104b807a9177.zip | |
drivers: usb: s3c-hsotg: fix gadget unregistering
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/gadget/s3c-hsotg.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c index 0ec467f1e89..69f9c5e3a98 100644 --- a/drivers/usb/gadget/s3c-hsotg.c +++ b/drivers/usb/gadget/s3c-hsotg.c @@ -2964,9 +2964,6 @@ static int s3c_hsotg_udc_stop(struct usb_gadget *gadget, if (!hsotg) return -ENODEV; - if (!driver || driver != hsotg->driver || !driver->unbind) - return -EINVAL; - /* all endpoints should be shutdown */ for (ep = 0; ep < hsotg->num_of_eps; ep++) s3c_hsotg_ep_disable(&hsotg->eps[ep].ep); @@ -2976,14 +2973,13 @@ static int s3c_hsotg_udc_stop(struct usb_gadget *gadget, s3c_hsotg_phy_disable(hsotg); regulator_bulk_disable(ARRAY_SIZE(hsotg->supplies), hsotg->supplies); - hsotg->driver = NULL; + if (!driver) + hsotg->driver = NULL; + hsotg->gadget.speed = USB_SPEED_UNKNOWN; spin_unlock_irqrestore(&hsotg->lock, flags); - dev_info(hsotg->dev, "unregistered gadget driver '%s'\n", - driver->driver.name); - return 0; } |