Commit d02337d2 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Revert "serial/sunsu: add missing of_node_put()"

This reverts commit 20d8e861.

As David Miller points out, it's wrong.
Reported-by: default avatarDavid Miller <davem@davemloft.net>
Cc: Yangtao Li <tiny.windzz@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2d13969e
...@@ -1394,32 +1394,22 @@ static inline struct console *SUNSU_CONSOLE(void) ...@@ -1394,32 +1394,22 @@ static inline struct console *SUNSU_CONSOLE(void)
static enum su_type su_get_type(struct device_node *dp) static enum su_type su_get_type(struct device_node *dp)
{ {
struct device_node *ap = of_find_node_by_path("/aliases"); struct device_node *ap = of_find_node_by_path("/aliases");
enum su_type rc = SU_PORT_PORT;
if (ap) { if (ap) {
struct device_node *tmp;
const char *keyb = of_get_property(ap, "keyboard", NULL); const char *keyb = of_get_property(ap, "keyboard", NULL);
const char *ms = of_get_property(ap, "mouse", NULL); const char *ms = of_get_property(ap, "mouse", NULL);
if (keyb) { if (keyb) {
tmp = of_find_node_by_path(keyb); if (dp == of_find_node_by_path(keyb))
if (tmp && dp == tmp){ return SU_PORT_KBD;
rc = SU_PORT_KBD;
goto out;
}
} }
if (ms) { if (ms) {
tmp = of_find_node_by_path(ms); if (dp == of_find_node_by_path(ms))
if (tmp && dp == tmp){ return SU_PORT_MS;
rc = SU_PORT_MS;
goto out;
}
} }
} }
out: return SU_PORT_PORT;
of_node_put(ap);
return rc;
} }
static int su_probe(struct platform_device *op) static int su_probe(struct platform_device *op)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment