* [PATCH] usb: dwc3: meson-g12a: add missed regulator_disable
@ 2019-11-18 11:41 Chuhong Yuan
2019-11-19 15:07 ` Neil Armstrong
0 siblings, 1 reply; 2+ messages in thread
From: Chuhong Yuan @ 2019-11-18 11:41 UTC (permalink / raw)
Cc: Felipe Balbi, Greg Kroah-Hartman, Kevin Hilman, linux-usb,
linux-arm-kernel, linux-amlogic, linux-kernel, Chuhong Yuan
The driver forgets to disable the regulator in probe failure and remove.
Add the missed calls to fix it.
Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
---
drivers/usb/dwc3/dwc3-meson-g12a.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/dwc3/dwc3-meson-g12a.c b/drivers/usb/dwc3/dwc3-meson-g12a.c
index 8a3ec1a951fe..d9723d1ad8eb 100644
--- a/drivers/usb/dwc3/dwc3-meson-g12a.c
+++ b/drivers/usb/dwc3/dwc3-meson-g12a.c
@@ -458,7 +458,7 @@ static int dwc3_meson_g12a_probe(struct platform_device *pdev)
dwc3_meson_g12a_irq_thread,
IRQF_ONESHOT, pdev->name, priv);
if (ret)
- return ret;
+ goto err_regulator_disable;
}
dwc3_meson_g12a_usb_init(priv);
@@ -467,7 +467,7 @@ static int dwc3_meson_g12a_probe(struct platform_device *pdev)
for (i = 0 ; i < PHY_COUNT ; ++i) {
ret = phy_init(priv->phys[i]);
if (ret)
- return ret;
+ goto err_regulator_disable;
}
/* Set PHY Power */
@@ -517,7 +517,9 @@ static int dwc3_meson_g12a_probe(struct platform_device *pdev)
err_phys_exit:
for (i = 0 ; i < PHY_COUNT ; ++i)
phy_exit(priv->phys[i]);
-
+err_regulator_disable:
+ if (priv->vbus)
+ regulator_disable(priv->vbus);
return ret;
}
@@ -536,6 +538,9 @@ static int dwc3_meson_g12a_remove(struct platform_device *pdev)
phy_exit(priv->phys[i]);
}
+ if (priv->vbus)
+ regulator_disable(priv->vbus);
+
pm_runtime_disable(dev);
pm_runtime_put_noidle(dev);
pm_runtime_set_suspended(dev);
--
2.24.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] usb: dwc3: meson-g12a: add missed regulator_disable
2019-11-18 11:41 [PATCH] usb: dwc3: meson-g12a: add missed regulator_disable Chuhong Yuan
@ 2019-11-19 15:07 ` Neil Armstrong
0 siblings, 0 replies; 2+ messages in thread
From: Neil Armstrong @ 2019-11-19 15:07 UTC (permalink / raw)
To: Chuhong Yuan
Cc: Felipe Balbi, Kevin Hilman, linux-usb, linux-kernel,
Greg Kroah-Hartman, linux-amlogic, linux-arm-kernel
On 18/11/2019 12:41, Chuhong Yuan wrote:
> The driver forgets to disable the regulator in probe failure and remove.
> Add the missed calls to fix it.
>
> Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
Fixes: f90db10779ad ("usb: dwc3: meson-g12a: Add support for IRQ based OTG switching")
> ---
> drivers/usb/dwc3/dwc3-meson-g12a.c | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/usb/dwc3/dwc3-meson-g12a.c b/drivers/usb/dwc3/dwc3-meson-g12a.c
> index 8a3ec1a951fe..d9723d1ad8eb 100644
> --- a/drivers/usb/dwc3/dwc3-meson-g12a.c
> +++ b/drivers/usb/dwc3/dwc3-meson-g12a.c
> @@ -458,7 +458,7 @@ static int dwc3_meson_g12a_probe(struct platform_device *pdev)
> dwc3_meson_g12a_irq_thread,
> IRQF_ONESHOT, pdev->name, priv);
> if (ret)
> - return ret;
> + goto err_regulator_disable;
> }
>
> dwc3_meson_g12a_usb_init(priv);
> @@ -467,7 +467,7 @@ static int dwc3_meson_g12a_probe(struct platform_device *pdev)
> for (i = 0 ; i < PHY_COUNT ; ++i) {
> ret = phy_init(priv->phys[i]);
> if (ret)
> - return ret;
> + goto err_regulator_disable;
> }
>
> /* Set PHY Power */
> @@ -517,7 +517,9 @@ static int dwc3_meson_g12a_probe(struct platform_device *pdev)
> err_phys_exit:
> for (i = 0 ; i < PHY_COUNT ; ++i)
> phy_exit(priv->phys[i]);
> -
> +err_regulator_disable:
> + if (priv->vbus)
> + regulator_disable(priv->vbus);
> return ret;
> }
>
> @@ -536,6 +538,9 @@ static int dwc3_meson_g12a_remove(struct platform_device *pdev)
> phy_exit(priv->phys[i]);
> }
>
> + if (priv->vbus)
> + regulator_disable(priv->vbus);
> +
> pm_runtime_disable(dev);
> pm_runtime_put_noidle(dev);
> pm_runtime_set_suspended(dev);
>
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-11-19 15:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-18 11:41 [PATCH] usb: dwc3: meson-g12a: add missed regulator_disable Chuhong Yuan
2019-11-19 15:07 ` Neil Armstrong
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).