2021-12-03 08:01:39

by Jiasheng Jiang

Subject: [PATCH] usb: chipidea: msm: Handle error codes

The return value of of_get_next_available_child() and
of_device_is_compatible() is not always 0.
To catch the exception in case of the failure.

Fixes: 47654a162081 ("usb: chipidea: msm: Restore wrapper settings after reset")
Signed-off-by: Jiasheng Jiang <[email protected]>
---
drivers/usb/chipidea/ci_hdrc_msm.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c b/drivers/usb/chipidea/ci_hdrc_msm.c
index 46105457e1ca..13218f0a2bed 100644
--- a/drivers/usb/chipidea/ci_hdrc_msm.c
+++ b/drivers/usb/chipidea/ci_hdrc_msm.c
@@ -246,6 +246,8 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev)
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");
+ if (!phy_node || !ci->hsic)
+ goto err_mux;
of_node_put(phy_node);
}
of_node_put(ulpi_node);
--
2.25.1

2021-12-04 13:02:42

by Peter Chen

Subject: Re: [PATCH] usb: chipidea: msm: Handle error codes

On 21-12-03 16:01:06, Jiasheng Jiang wrote:
> The return value of of_get_next_available_child() and
> of_device_is_compatible() is not always 0.
> To catch the exception in case of the failure.
>
> Fixes: 47654a162081 ("usb: chipidea: msm: Restore wrapper settings after reset")
> Signed-off-by: Jiasheng Jiang <[email protected]>
> ---
> drivers/usb/chipidea/ci_hdrc_msm.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c b/drivers/usb/chipidea/ci_hdrc_msm.c
> index 46105457e1ca..13218f0a2bed 100644
> --- a/drivers/usb/chipidea/ci_hdrc_msm.c
> +++ b/drivers/usb/chipidea/ci_hdrc_msm.c
> @@ -246,6 +246,8 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev)
> 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");
> + if (!phy_node || !ci->hsic)
> + goto err_mux;

I afraid I could not understand your change with your patch description,
no matter phy_node is NULL or ci->hsic is NULL, the code should be OK,
right?

> of_node_put(phy_node);
> }
> of_node_put(ulpi_node);
> --
> 2.25.1
>

--

Thanks,
Peter Chen