diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-05 10:53:42 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-05 10:53:42 +0100 |
| commit | d02337d29d33da6f1f83bebd7d3997e78df1df9e (patch) | |
| tree | dd42b6252327c895cbac66a0dd48c2cd28c448a5 /drivers/tty | |
| parent | 2d13969ee7d892c69a9fff5af8c0356682290c41 (diff) | |
| download | linux-stable-d02337d29d33da6f1f83bebd7d3997e78df1df9e.tar.gz linux-stable-d02337d29d33da6f1f83bebd7d3997e78df1df9e.tar.bz2 linux-stable-d02337d29d33da6f1f83bebd7d3997e78df1df9e.zip | |
Revert "serial/sunsu: add missing of_node_put()"
This reverts commit 20d8e8611eb0596047fd4389be7a7203a883b9bf.
As David Miller points out, it's wrong.
Reported-by: David Miller <davem@davemloft.net>
Cc: Yangtao Li <tiny.windzz@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/sunsu.c | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/drivers/tty/serial/sunsu.c b/drivers/tty/serial/sunsu.c index 4a27c0114d50..6cf3e9b0728f 100644 --- a/drivers/tty/serial/sunsu.c +++ b/drivers/tty/serial/sunsu.c @@ -1394,32 +1394,22 @@ static inline struct console *SUNSU_CONSOLE(void) static enum su_type su_get_type(struct device_node *dp) { struct device_node *ap = of_find_node_by_path("/aliases"); - enum su_type rc = SU_PORT_PORT; if (ap) { - struct device_node *tmp; const char *keyb = of_get_property(ap, "keyboard", NULL); const char *ms = of_get_property(ap, "mouse", NULL); if (keyb) { - tmp = of_find_node_by_path(keyb); - if (tmp && dp == tmp){ - rc = SU_PORT_KBD; - goto out; - } + if (dp == of_find_node_by_path(keyb)) + return SU_PORT_KBD; } if (ms) { - tmp = of_find_node_by_path(ms); - if (tmp && dp == tmp){ - rc = SU_PORT_MS; - goto out; - } + if (dp == of_find_node_by_path(ms)) + return SU_PORT_MS; } } -out: - of_node_put(ap); - return rc; + return SU_PORT_PORT; } static int su_probe(struct platform_device *op) |