2020-12-15 02:54:08

by Zheng Zengkai

Subject: [RESEND] usb: dwc3: meson-g12a: disable clk on error handling path in probe

dwc3_meson_g12a_probe() does not invoke clk_bulk_disable_unprepare()
on one error handling path. This patch fixes that.

Fixes: 347052e3bf1b ("usb: dwc3: meson-g12a: fix USB2 PHY initialization on G12A and A1 SoCs")
Reported-by: Hulk Robot <[email protected]>
Signed-off-by: Zheng Zengkai <[email protected]>
Reviewed-by: Martin Blumenstingl <[email protected]>
---
drivers/usb/dwc3/dwc3-meson-g12a.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/dwc3/dwc3-meson-g12a.c b/drivers/usb/dwc3/dwc3-meson-g12a.c
index 417e05381b5d..bdf1f98dfad8 100644
--- a/drivers/usb/dwc3/dwc3-meson-g12a.c
+++ b/drivers/usb/dwc3/dwc3-meson-g12a.c
@@ -754,7 +754,7 @@ static int dwc3_meson_g12a_probe(struct platform_device *pdev)

ret = priv->drvdata->setup_regmaps(priv, base);
if (ret)
- return ret;
+ goto err_disable_clks;

if (priv->vbus) {
ret = regulator_enable(priv->vbus);
--
2.20.1

2020-12-23 02:16:21

by Zheng Zengkai

Subject: Re: [RESEND] usb: dwc3: meson-g12a: disable clk on error handling path in probe

Hi everyone,

Friendly ping:

Just want to know why this patch was ignored,

Am I missing something?

Merry Christmas and Happy New Year!

> dwc3_meson_g12a_probe() does not invoke clk_bulk_disable_unprepare()
> on one error handling path. This patch fixes that.
>
> Fixes: 347052e3bf1b ("usb: dwc3: meson-g12a: fix USB2 PHY initialization on G12A and A1 SoCs")
> Reported-by: Hulk Robot <[email protected]>
> Signed-off-by: Zheng Zengkai <[email protected]>
> Reviewed-by: Martin Blumenstingl <[email protected]>
> ---
> drivers/usb/dwc3/dwc3-meson-g12a.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/usb/dwc3/dwc3-meson-g12a.c b/drivers/usb/dwc3/dwc3-meson-g12a.c
> index 417e05381b5d..bdf1f98dfad8 100644
> --- a/drivers/usb/dwc3/dwc3-meson-g12a.c
> +++ b/drivers/usb/dwc3/dwc3-meson-g12a.c
> @@ -754,7 +754,7 @@ static int dwc3_meson_g12a_probe(struct platform_device *pdev)
>
> ret = priv->drvdata->setup_regmaps(priv, base);
> if (ret)
> - return ret;
> + goto err_disable_clks;
>
> if (priv->vbus) {
> ret = regulator_enable(priv->vbus);

2020-12-23 08:13:48

by Greg Kroah-Hartman

Subject: Re: [RESEND] usb: dwc3: meson-g12a: disable clk on error handling path in probe

On Wed, Dec 23, 2020 at 10:13:03AM +0800, Zheng Zengkai wrote:
> Hi everyone,
>
> Friendly ping:
>
> Just want to know why this patch was ignored,

Right now it is the merge window and we can't do anything with any
patches until 5.11-rc1 is out. After that happens, I'll work on
catching up on older patches like this.

thanks,

greg k-h

2020-12-23 14:44:09

by Zheng Zengkai

Subject: Re: [RESEND] usb: dwc3: meson-g12a: disable clk on error handling path in probe

Hi Greg,

> On Wed, Dec 23, 2020 at 10:13:03AM +0800, Zheng Zengkai wrote:
>> Hi everyone,
>>
>> Friendly ping:
>>
>> Just want to know why this patch was ignored,
> Right now it is the merge window and we can't do anything with any
> patches until 5.11-rc1 is out. After that happens, I'll work on
> catching up on older patches like this.
>
> thanks,
>
> greg k-h
> .

Thank you very much for your reply and information!

Best Regards,

Zheng Zengkai