diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-12-06 19:17:24 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-12-06 19:17:24 +0300 |
| commit | dd63af108f0814f0b589659f4e55a7a5af3b7e53 (patch) | |
| tree | 0a7679fecb5b516cddb2153c632a4262899be6c3 /arch/arm/mach-mvebu/coherency.c | |
| parent | 50d1e7d1077b276e8faa9eebf8b710edf31fdeea (diff) | |
| parent | 009d0431c3914de64666bec0d350e54fdd59df6a (diff) | |
| download | linux-dd63af108f0814f0b589659f4e55a7a5af3b7e53.tar.xz | |
Merge 3.18-rc7 into tty-next
This resolves the merge issue with drivers/tty/serial/of_serial.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/mach-mvebu/coherency.c')
| -rw-r--r-- | arch/arm/mach-mvebu/coherency.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c index 2bdc3233abe2..044b51185fcc 100644 --- a/arch/arm/mach-mvebu/coherency.c +++ b/arch/arm/mach-mvebu/coherency.c @@ -400,6 +400,8 @@ int __init coherency_init(void) type == COHERENCY_FABRIC_TYPE_ARMADA_380) armada_375_380_coherency_init(np); + of_node_put(np); + return 0; } |