diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-06-07 11:25:30 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-06-07 11:25:30 +0300 |
| commit | 4c7aba46c9e82aa236502760a677e666589afead (patch) | |
| tree | 9baa94b072fa58c674c34b8ddaec8b9e727e1657 /drivers/usb/host/ehci-platform.c | |
| parent | d2dc2a96de9d58038ac1f9ee432e88a70958d59b (diff) | |
| parent | ba3021b2c79b2fa9114f92790a99deb27a65b728 (diff) | |
| download | linux-4c7aba46c9e82aa236502760a677e666589afead.tar.xz | |
Merge branch 'for-linus' into for-next
For applying more ALSA timer cleanups.
Diffstat (limited to 'drivers/usb/host/ehci-platform.c')
| -rw-r--r-- | drivers/usb/host/ehci-platform.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c index bc7b9be12f54..f1908ea9fbd8 100644 --- a/drivers/usb/host/ehci-platform.c +++ b/drivers/usb/host/ehci-platform.c @@ -384,8 +384,10 @@ static int ehci_platform_resume(struct device *dev) } companion_dev = usb_of_get_companion_dev(hcd->self.controller); - if (companion_dev) + if (companion_dev) { device_pm_wait_for_dev(hcd->self.controller, companion_dev); + put_device(companion_dev); + } ehci_resume(hcd, priv->reset_on_resume); return 0; |