diff options
| author | Johan Hovold <johan@kernel.org> | 2017-05-16 16:26:13 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-05-17 11:52:44 +0200 |
| commit | a7415477a20448bbb7d13765784c0b29249a176f (patch) | |
| tree | 1c323e463e4b02bfd9f8b81db1a6f1daa2a70bdd | |
| parent | 1f873d857b6c2fefb4dada952674aa01bcfb92bd (diff) | |
| download | linux-integrity-a7415477a20448bbb7d13765784c0b29249a176f.tar.gz | |
USB: ehci-platform: fix companion-device leak
Make sure do drop the reference taken to the companion device during
resume.
Fixes: d4d75128b8fd ("usb: host: ehci-platform: fix usb 1.1 device is not connected in system resume")
Cc: stable <stable@vger.kernel.org> # 4.11
Signed-off-by: Johan Hovold <johan@kernel.org>
Acked-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 bc7b9be12f540c..f1908ea9fbd863 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; |