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

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

drivers/tty/serial/sunsu.c

+5 −15
Original line number Diff line number Diff line
@@ -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)