aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <krzk@kernel.org>2017-01-07 03:41:41 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-05-14 08:00:18 -0400
commit4a36b6a7ee882cd0ffdbfb8c9ce8097b8abea973 (patch)
treeeb73bd4ae51d21fd257e442d24ffd9403e7e40f6
parent8f50cb88d862d2aaa084fedc34c75b04ae4a4b16 (diff)
usb: host: ohci-exynos: Decrese node refcount on exynos_ehci_get_phy() error paths
commit 68bd6fc3cfa98ef253e17307ccafd8ef907b5556 upstream. Returning from for_each_available_child_of_node() loop requires cleaning up node refcount. Error paths lacked it so for example in case of deferred probe, the refcount of phy node was left increased. Fixes: 6d40500ac9b6 ("usb: ehci/ohci-exynos: Fix of_node_put() for child when getting PHYs") Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Acked-by: Alan Stern <stern@rowland.harvard.edu> Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/host/ohci-exynos.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/host/ohci-exynos.c b/drivers/usb/host/ohci-exynos.c
index 2cd105be7319..6865b919403f 100644
--- a/drivers/usb/host/ohci-exynos.c
+++ b/drivers/usb/host/ohci-exynos.c
@@ -66,10 +66,12 @@ static int exynos_ohci_get_phy(struct device *dev,
66 if (IS_ERR(phy)) { 66 if (IS_ERR(phy)) {
67 ret = PTR_ERR(phy); 67 ret = PTR_ERR(phy);
68 if (ret == -EPROBE_DEFER) { 68 if (ret == -EPROBE_DEFER) {
69 of_node_put(child);
69 return ret; 70 return ret;
70 } else if (ret != -ENOSYS && ret != -ENODEV) { 71 } else if (ret != -ENOSYS && ret != -ENODEV) {
71 dev_err(dev, 72 dev_err(dev,
72 "Error retrieving usb2 phy: %d\n", ret); 73 "Error retrieving usb2 phy: %d\n", ret);
74 of_node_put(child);
73 return ret; 75 return ret;
74 } 76 }
75 } 77 }