Commit 964728f9 authored by Johan Hovold's avatar Johan Hovold Committed by Peter Chen

USB: chipidea: msm: fix ulpi-node lookup

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: 47654a16 ("usb: chipidea: msm: Restore wrapper settings after reset")
Fixes: b74c4315 ("usb: chipidea: msm: ci_hdrc_msm_probe() missing of_node_get()")
Cc: stable <stable@vger.kernel.org>     # 4.10: b74c4315
Cc: Stephen Boyd <stephen.boyd@linaro.org>
Cc: Frank Rowand <frank.rowand@sony.com>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarPeter Chen <peter.chen@nxp.com>
parent 72b663a9
...@@ -247,7 +247,7 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev) ...@@ -247,7 +247,7 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev)
if (ret) if (ret)
goto err_mux; 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) { if (ulpi_node) {
phy_node = of_get_next_available_child(ulpi_node, NULL); phy_node = of_get_next_available_child(ulpi_node, NULL);
ci->hsic = of_device_is_compatible(phy_node, "qcom,usb-hsic-phy"); ci->hsic = of_device_is_compatible(phy_node, "qcom,usb-hsic-phy");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment