Commit 76916b66 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Merge tag 'usb-ci-v4.15-rc5' of...

Merge tag 'usb-ci-v4.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-linus

Peter writes:

One fix for ulpi-node lookup at msm glue driver
parents 7f038d25 964728f9
...@@ -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