Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1370812 > unrolled thread

[PATCH] gpio: zynq: Fix the error path

Back to article view | Back to linux.kernel

Contents

  [PATCH] gpio: zynq: Fix the error path Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com> - 2016-04-04 20:30 +0200
    Re: [PATCH] gpio: zynq: Fix the error path Linus Walleij <linus.walleij@linaro.org> - 2016-04-06 15:50 +0200

#1370812 — [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 <shubhraj@xilinx.com>
---
 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

[toc] | [next] | [standalone]

#1372529

On Mon, Apr 4, 2016 at 8:14 PM, Shubhrajyoti Datta
<shubhrajyoti.datta@xilinx.com> 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 <shubhraj@xilinx.com>

Patch applied.

Yours,
Linus Walleij

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web