shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

usb: host: ehci-platform: fix companion-device leak for rockchip

Browse Source 
Make sure do drop the reference taken to the companion device
during probe/remove/resume.

Fixes: 68850661b5 ("usb: host: ehci-platform: Add device_link between the ehci and companion")
Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I0bbfe77987a1c11bfaa5006d98a56480ff16224f
This commit is contained in:
William Wu
2022-10-10 11:23:40 +08:00
parent f727d3ad8e
commit 7a616cbc2f
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/usb/host/ehci-platform.c
View File

@@ -422,6 +422,7 @@ static int ehci_platform_probe(struct platform_device *dev)
if (companion_dev) {
link = device_link_add(companion_dev, hcd->self.controller,
DL_FLAG_STATELESS);
put_device(companion_dev);
if (!link) {
dev_err(&dev->dev, "Unable to link %s\n",
dev_name(companion_dev));
@@ -473,8 +474,10 @@ static int ehci_platform_remove(struct platform_device *dev)
if (of_device_is_compatible(dev->dev.of_node,
"rockchip,rk3588-ehci")) {
companion_dev = usb_of_get_companion_dev(hcd->self.controller);
if (companion_dev)
if (companion_dev) {
device_link_remove(companion_dev, hcd->self.controller);
put_device(companion_dev);
}
}
usb_remove_hcd(hcd);
@@ -535,8 +538,9 @@ static int __maybe_unused ehci_platform_resume(struct device *dev)
}
companion_dev = usb_of_get_companion_dev(hcd->self.controller);
if (companion_dev && !device_is_dependent(hcd->self.controller, companion_dev)) {
device_pm_wait_for_dev(hcd->self.controller, companion_dev);
if (companion_dev) {
if (!device_is_dependent(hcd->self.controller, companion_dev))
device_pm_wait_for_dev(hcd->self.controller, companion_dev);
put_device(companion_dev);
}