diff options
Diffstat (limited to 'queue/USB-chipidea-msm-fix-ulpi-node-lookup.patch')
| -rw-r--r-- | queue/USB-chipidea-msm-fix-ulpi-node-lookup.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/queue/USB-chipidea-msm-fix-ulpi-node-lookup.patch b/queue/USB-chipidea-msm-fix-ulpi-node-lookup.patch deleted file mode 100644 index b1582dc..0000000 --- a/queue/USB-chipidea-msm-fix-ulpi-node-lookup.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 964728f9f407eca0b417fdf8e784b7a76979490c Mon Sep 17 00:00:00 2001 -From: Johan Hovold <johan@kernel.org> -Date: Mon, 13 Nov 2017 11:12:58 +0100 -Subject: [PATCH] USB: chipidea: msm: fix ulpi-node lookup - -commit 964728f9f407eca0b417fdf8e784b7a76979490c upstream. - -Fix child-node lookup during probe, which ended up searching the whole -device tree depth-first starting at the parent rather than just matching -on its children. - -Note that the original premature free of the parent node has already -been fixed separately, but that fix was apparently never backported to -stable. - -Fixes: 47654a162081 ("usb: chipidea: msm: Restore wrapper settings after reset") -Fixes: b74c43156c0c ("usb: chipidea: msm: ci_hdrc_msm_probe() missing of_node_get()") -Cc: stable <stable@vger.kernel.org> # 4.10: b74c43156c0c -Cc: Stephen Boyd <stephen.boyd@linaro.org> -Cc: Frank Rowand <frank.rowand@sony.com> -Signed-off-by: Johan Hovold <johan@kernel.org> -Signed-off-by: Peter Chen <peter.chen@nxp.com> - -diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c b/drivers/usb/chipidea/ci_hdrc_msm.c -index 3593ce0ec641..880009987460 100644 ---- a/drivers/usb/chipidea/ci_hdrc_msm.c -+++ b/drivers/usb/chipidea/ci_hdrc_msm.c -@@ -247,7 +247,7 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev) - if (ret) - goto err_mux; - -- ulpi_node = of_find_node_by_name(of_node_get(pdev->dev.of_node), "ulpi"); -+ ulpi_node = of_get_child_by_name(pdev->dev.of_node, "ulpi"); - if (ulpi_node) { - phy_node = of_get_next_available_child(ulpi_node, NULL); - ci->hsic = of_device_is_compatible(phy_node, "qcom,usb-hsic-phy"); --- -2.15.0 - |