diff options
| author | Laurent Vivier <lvivier@redhat.com> | 2017-07-21 16:51:39 +0200 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2017-09-10 16:35:45 -0400 |
| commit | 333ff1740a1f51a3ce43b0c9d739f21c4e6ed659 (patch) | |
| tree | 30746cea71ebc0b4c6a8630cb89c4976480e0334 /arch | |
| parent | d47e660f3127d87d163112a2c02e245cc840adf5 (diff) | |
powerpc/pseries: Fix of_node_put() underflow during reconfig remove
[ Upstream commit 4fd1bd443e80b12f0a01a45fb9a793206b41cb72 ]
As for commit 68baf692c435 ("powerpc/pseries: Fix of_node_put()
underflow during DLPAR remove"), the call to of_node_put() must be
removed from pSeries_reconfig_remove_node().
dlpar_detach_node() and pSeries_reconfig_remove_node() both call
of_detach_node(), and thus the node should not be released in both
cases.
Fixes: 0829f6d1f69e ("of: device_node kobject lifecycle fixes")
Cc: stable@vger.kernel.org # v3.15+
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/platforms/pseries/reconfig.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pseries/reconfig.c b/arch/powerpc/platforms/pseries/reconfig.c index 0f319521e002..14392b4e4693 100644 --- a/arch/powerpc/platforms/pseries/reconfig.c +++ b/arch/powerpc/platforms/pseries/reconfig.c @@ -112,7 +112,6 @@ static int pSeries_reconfig_remove_node(struct device_node *np) of_detach_node(np); of_node_put(parent); - of_node_put(np); /* Must decrement the refcount */ return 0; } |