diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-07-02 08:21:54 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-07-02 08:21:54 +0200 |
| commit | 7f5d8f711687fb6ad39ece9dd8e76dc6b196ac5c (patch) | |
| tree | f11fd2349981d5c86cfcaf11029946d18cdcb5f7 /drivers/usb/dwc3/dwc3-of-simple.c | |
| parent | staging: rtl8188eu: remove whitespace - coding style (diff) | |
| parent | Linux 4.18-rc3 (diff) | |
| download | linux-7f5d8f711687fb6ad39ece9dd8e76dc6b196ac5c.tar.xz linux-7f5d8f711687fb6ad39ece9dd8e76dc6b196ac5c.zip | |
Merge 4.18-rc3 into staging-next
We want the staging/iio fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/dwc3/dwc3-of-simple.c')
| -rw-r--r-- | drivers/usb/dwc3/dwc3-of-simple.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/dwc3/dwc3-of-simple.c b/drivers/usb/dwc3/dwc3-of-simple.c index 6b3ccd542bd7..dbeff5e6ad14 100644 --- a/drivers/usb/dwc3/dwc3-of-simple.c +++ b/drivers/usb/dwc3/dwc3-of-simple.c @@ -165,8 +165,9 @@ static int dwc3_of_simple_remove(struct platform_device *pdev) reset_control_put(simple->resets); - pm_runtime_put_sync(dev); pm_runtime_disable(dev); + pm_runtime_put_noidle(dev); + pm_runtime_set_suspended(dev); return 0; } |