Skip to contentSkip to conversation

Patch "gpio: zynq: Fix the error path" has been added to the 4.6-stable tree

PATCH [email protected] 1 participant 1 message Jun 22, 2016

Subsystems (4)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

gpio: zynq: Fix the error path

to the 4.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
gpio-zynq-fix-the-error-path.patch
and it can be found in the queue-4.6 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 615d23f80efc60f8c5146223f305d19207c742e4 Mon Sep 17 00:00:00 2001

From: Shubhrajyoti Datta <[email protected]>
Date: Mon, 4 Apr 2016 23:44:06 +0530
Subject: gpio: zynq: Fix the error path

From: Shubhrajyoti Datta <[email protected]>

commit 615d23f80efc60f8c5146223f305d19207c742e4 upstream.

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

---
 drivers/gpio/gpio-zynq.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpio/gpio-zynq.c +3 -1
@@ -713,7 +713,7 @@ static int zynq_gpio_probe(struct platfo
 	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;
 }

Patches currently in stable-queue which might be from [email protected] are

queue-4.6/gpio-zynq-fix-the-error-path.patch