2020-05-21 07:43:52

by Dinghao Liu

Subject: [PATCH] usb: cdns3: Fix runtime PM imbalance on error

pm_runtime_get_sync() increments the runtime PM usage counter even
when it returns an error code. Thus a pairing decrement is needed on
the error handling path to keep the counter balanced.

Signed-off-by: Dinghao Liu <[email protected]>
---
drivers/usb/cdns3/cdns3-ti.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/usb/cdns3/cdns3-ti.c b/drivers/usb/cdns3/cdns3-ti.c
index 5685ba11480b..e701ab56b0a7 100644
--- a/drivers/usb/cdns3/cdns3-ti.c
+++ b/drivers/usb/cdns3/cdns3-ti.c
@@ -138,7 +138,7 @@ static int cdns_ti_probe(struct platform_device *pdev)
error = pm_runtime_get_sync(dev);
if (error < 0) {
dev_err(dev, "pm_runtime_get_sync failed: %d\n", error);
- goto err_get;
+ goto err;
}

/* assert RESET */
@@ -185,7 +185,6 @@ static int cdns_ti_probe(struct platform_device *pdev)

err:
pm_runtime_put_sync(data->dev);
-err_get:
pm_runtime_disable(data->dev);

return error;
--
2.17.1

2020-05-21 23:38:48

by Peter Chen

Subject: Re: [PATCH] usb: cdns3: Fix runtime PM imbalance on error

On Thu, May 21, 2020 at 3:42 PM Dinghao Liu <[email protected]> wrote:
>
> pm_runtime_get_sync() increments the runtime PM usage counter even
> when it returns an error code. Thus a pairing decrement is needed on
> the error handling path to keep the counter balanced.
>
> Signed-off-by: Dinghao Liu <[email protected]>
> ---
> drivers/usb/cdns3/cdns3-ti.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/usb/cdns3/cdns3-ti.c b/drivers/usb/cdns3/cdns3-ti.c
> index 5685ba11480b..e701ab56b0a7 100644
> --- a/drivers/usb/cdns3/cdns3-ti.c
> +++ b/drivers/usb/cdns3/cdns3-ti.c
> @@ -138,7 +138,7 @@ static int cdns_ti_probe(struct platform_device *pdev)
> error = pm_runtime_get_sync(dev);
> if (error < 0) {
> dev_err(dev, "pm_runtime_get_sync failed: %d\n", error);
> - goto err_get;
> + goto err;
> }
>
> /* assert RESET */
> @@ -185,7 +185,6 @@ static int cdns_ti_probe(struct platform_device *pdev)
>
> err:
> pm_runtime_put_sync(data->dev);
> -err_get:
> pm_runtime_disable(data->dev);
>
> return error;
> --

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