2023-04-12 06:08:49

by Yinhao Hu

Subject: [PATCH] usb: chipidea: fix missing goto in `ci_hdrc_probe`

From the comment of ci_usb_phy_init, it returns an error code if
usb_phy_init has failed, and it should do some clean up, not just
return directly.

Fix this by goto the error handling.

Fixes: 74475ede784d ("usb: chipidea: move PHY operation to core")
Signed-off-by: Yinhao Hu <[email protected]>
Reviewed-by: Dongliang Mu <[email protected]>
---
drivers/usb/chipidea/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
index 281fc51720ce..25084ce7c297 100644
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@ -1108,7 +1108,7 @@ static int ci_hdrc_probe(struct platform_device *pdev)
ret = ci_usb_phy_init(ci);
if (ret) {
dev_err(dev, "unable to init phy: %d\n", ret);
- return ret;
+ goto ulpi_exit;
}

ci->hw_bank.phys = res->start;
--
2.34.1

2023-04-17 02:12:21

by Peter Chen

Subject: Re: [PATCH] usb: chipidea: fix missing goto in `ci_hdrc_probe`

On Wed, Apr 12, 2023 at 2:01 PM Yinhao Hu <[email protected]> wrote:
>
> From the comment of ci_usb_phy_init, it returns an error code if
> usb_phy_init has failed, and it should do some clean up, not just
> return directly.
>
> Fix this by goto the error handling.
>
> Fixes: 74475ede784d ("usb: chipidea: move PHY operation to core")
> Signed-off-by: Yinhao Hu <[email protected]>
> Reviewed-by: Dongliang Mu <[email protected]>
> ---
> drivers/usb/chipidea/core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
> index 281fc51720ce..25084ce7c297 100644
> --- a/drivers/usb/chipidea/core.c
> +++ b/drivers/usb/chipidea/core.c
> @@ -1108,7 +1108,7 @@ static int ci_hdrc_probe(struct platform_device *pdev)
> ret = ci_usb_phy_init(ci);
> if (ret) {
> dev_err(dev, "unable to init phy: %d\n", ret);
> - return ret;
> + goto ulpi_exit;
> }
>
> ci->hw_bank.phys = res->start;
> --
> 2.34.1
>

Acked-by: Peter Chen <[email protected]>

Peter