[3.19.y-ckt stable] Patch "PM / Domains: Fix bad of_node_put() in failure paths of genpd_dev_pm_attach()" has been added to staging queue

[Kamal Mostafa]

This is a note to let you know that I have just added a patch titled

    PM / Domains: Fix bad of_node_put() in failure paths of genpd_dev_pm_attach()

to the linux-3.19.y-queue branch of the 3.19.y-ckt extended stable tree 
which can be found at:

    http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-3.19.y-queue

This patch is scheduled to be released in version 3.19.8-ckt12.

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.19.y-ckt tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Kamal

------

>From 2bb7091312c81544c51ebd01a531d8a844542877 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric at anholt.net>
Date: Tue, 1 Dec 2015 09:39:31 -0800
Subject: PM / Domains: Fix bad of_node_put() in failure paths of
 genpd_dev_pm_attach()

commit 265e2cf672aaa9421e7012b4aa30c0ed80f1a447 upstream.

It looks like these meant to be unreffing the
of_parse_phandle_with_args() node, since the error paths above it
don't do of_node_put.  That function returns a new ref in pd_args.np,
though, not a new ref on dev->of_node.  Also, it would have leaked the
ref in the success case.

Fixes "ERROR: Bad of_node_put()" on bcm2835 in the -EPROBE_DEFER case.

Fixes: aa42240ab254 (PM / Domains: Add generic OF-based PM domain look-up)
Signed-off-by: Eric Anholt <eric at anholt.net>
Acked-by: Ulf Hansson <ulf.hansson at linaro.org>
Acked-by: Kevin Hilman <khilman at linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki at intel.com>
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
 drivers/base/power/domain.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 0d8780c..1401e6c 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -2199,10 +2199,10 @@ int genpd_dev_pm_attach(struct device *dev)
 	}

 	pd = of_genpd_get_from_provider(&pd_args);
+	of_node_put(pd_args.np);
 	if (IS_ERR(pd)) {
 		dev_dbg(dev, "%s() failed to find PM domain: %ld\n",
 			__func__, PTR_ERR(pd));
-		of_node_put(dev->of_node);
 		return PTR_ERR(pd);
 	}

@@ -2218,7 +2218,6 @@ int genpd_dev_pm_attach(struct device *dev)
 	if (ret < 0) {
 		dev_err(dev, "failed to add to PM domain %s: %d",
 			pd->name, ret);
-		of_node_put(dev->of_node);
 		return ret;
 	}

--
1.9.1