diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-28 08:34:10 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-28 08:34:10 +0100 |
| commit | 0edbf9e55295585bbe9df61b646ca5bf80a8e1eb (patch) | |
| tree | d9b6869ff7a245343a9b030511d4bfd18b00f192 /drivers/usb/musb/omap2430.c | |
| parent | eacae5d2b940b39e7234036bf62869aff5ffe055 (diff) | |
| parent | e5517c2a5a49ed5e99047008629f1cd60246ea0e (diff) | |
| download | linux-stable-0edbf9e55295585bbe9df61b646ca5bf80a8e1eb.tar.gz linux-stable-0edbf9e55295585bbe9df61b646ca5bf80a8e1eb.tar.bz2 linux-stable-0edbf9e55295585bbe9df61b646ca5bf80a8e1eb.zip | |
Merge 4.9-rc7 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/musb/omap2430.c')
| -rw-r--r-- | drivers/usb/musb/omap2430.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c index 7c9aa5e78666..8b73214a9ea3 100644 --- a/drivers/usb/musb/omap2430.c +++ b/drivers/usb/musb/omap2430.c @@ -513,17 +513,18 @@ static int omap2430_probe(struct platform_device *pdev) } pm_runtime_enable(glue->dev); - pm_runtime_use_autosuspend(glue->dev); - pm_runtime_set_autosuspend_delay(glue->dev, 100); ret = platform_device_add(musb); if (ret) { dev_err(&pdev->dev, "failed to register musb device\n"); - goto err2; + goto err3; } return 0; +err3: + pm_runtime_disable(glue->dev); + err2: platform_device_put(musb); @@ -535,10 +536,7 @@ static int omap2430_remove(struct platform_device *pdev) { struct omap2430_glue *glue = platform_get_drvdata(pdev); - pm_runtime_get_sync(glue->dev); platform_device_unregister(glue->musb); - pm_runtime_put_sync(glue->dev); - pm_runtime_dont_use_autosuspend(glue->dev); pm_runtime_disable(glue->dev); return 0; |