2016-04-04 18:28:47

by Shubhrajyoti Datta

Subject: [PATCH] gpio: zynq: Fix the error path

pm_runtime_disable is called only in remove it is missed
out in the error path.
Fix the same.

Signed-off-by: Shubhrajyoti Datta <[email protected]>
---
drivers/gpio/gpio-zynq.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/gpio/gpio-zynq.c b/drivers/gpio/gpio-zynq.c
index 66d3d24..75c6355 100644
--- a/drivers/gpio/gpio-zynq.c
+++ b/drivers/gpio/gpio-zynq.c
@@ -713,7 +713,7 @@ static int zynq_gpio_probe(struct platform_device *pdev)
pm_runtime_enable(&pdev->dev);
ret = pm_runtime_get_sync(&pdev->dev);
if (ret < 0)
- return ret;
+ goto err_pm_dis;

/* report a bug if gpio chip registration fails */
ret = gpiochip_add_data(chip, gpio);
@@ -745,6 +745,8 @@ err_rm_gpiochip:
gpiochip_remove(chip);
err_pm_put:
pm_runtime_put(&pdev->dev);
+err_pm_dis:
+ pm_runtime_disable(&pdev->dev);

return ret;
}
--
1.7.1

2016-04-06 13:40:38

by Linus Walleij

Subject: Re: [PATCH] gpio: zynq: Fix the error path

On Mon, Apr 4, 2016 at 8:14 PM, Shubhrajyoti Datta
<[email protected]> wrote:

> pm_runtime_disable is called only in remove it is missed
> out in the error path.
> Fix the same.
>
> Signed-off-by: Shubhrajyoti Datta <[email protected]>

Patch applied.

Yours,
Linus Walleij