diff options
| author | Laurent Vivier <lvivier@redhat.com> | 2017-07-21 16:51:39 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-06 19:19:39 -0700 |
| commit | c4efb7434a2ac4dfc26568e09e9b8fe91160834b (patch) | |
| tree | de5f61f7b3bf0a58d51572da31a1864c7c0f05e8 | |
| parent | fdbcb81b5a319dd3e34105a2793c1189bdbfa646 (diff) | |
| download | linux-stable-c4efb7434a2ac4dfc26568e09e9b8fe91160834b.tar.gz linux-stable-c4efb7434a2ac4dfc26568e09e9b8fe91160834b.tar.bz2 linux-stable-c4efb7434a2ac4dfc26568e09e9b8fe91160834b.zip | |
powerpc/pseries: Fix of_node_put() underflow during reconfig remove
commit 4fd1bd443e80b12f0a01a45fb9a793206b41cb72 upstream.
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")
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 7c7fcc042549..fb695f142563 100644 --- a/arch/powerpc/platforms/pseries/reconfig.c +++ b/arch/powerpc/platforms/pseries/reconfig.c @@ -82,7 +82,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; } |