diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-09 09:05:05 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-09 09:05:05 +0200 |
| commit | 9424e8b1fedbaff34df187fdb87f9a9cba2d0ff2 (patch) | |
| tree | 7a595ccc67ae0cd9a414383ff2f6ede291c7dc18 /arch/powerpc/platforms/pseries/dlpar.c | |
| parent | bccf1da3546cc7aeefadc63cd4356ab8dc04c1e3 (diff) | |
| parent | 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f (diff) | |
| download | linux-0-day-9424e8b1fedbaff34df187fdb87f9a9cba2d0ff2.tar.gz linux-0-day-9424e8b1fedbaff34df187fdb87f9a9cba2d0ff2.tar.xz | |
Merge 4.14-rc4 into tty-next
We want the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/powerpc/platforms/pseries/dlpar.c')
| -rw-r--r-- | arch/powerpc/platforms/pseries/dlpar.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c index 783f363646909..e45b5f10645ae 100644 --- a/arch/powerpc/platforms/pseries/dlpar.c +++ b/arch/powerpc/platforms/pseries/dlpar.c @@ -266,7 +266,6 @@ int dlpar_attach_node(struct device_node *dn, struct device_node *parent) return rc; } - of_node_put(dn->parent); return 0; } |