of: correct of_console_check()'s return value
authorBrian Norris <computersforpeace@gmail.com>
Wed, 3 Sep 2014 18:06:43 +0000 (11:06 -0700)
committerSimon Horman <horms+renesas@verge.net.au>
Fri, 5 Dec 2014 04:32:07 +0000 (13:32 +0900)
The comments above of_console_check() say that it will return TRUE if it
registers a preferred console, but add_preferred_console() uses a
0-equals-success convention, so this leaves of_console_check() with an
inconsistent policy for its return values.

Fortunately, nobody was actually checking the return value of
of_console_check(), so this isn't significant at the moment.

But let's match the comments, so we're doing what we say.

Fixes: 3482f2c52b77 ('of: Create of_console_check() for selecting a console specified in /chosen')
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
(cherry picked from commit 5f74d8b7b8546255db6af45b017e9cbb18aed609)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
drivers/of/base.c

index fbf599b..c04d2e0 100644 (file)
@@ -1940,7 +1940,7 @@ bool of_console_check(struct device_node *dn, char *name, int index)
 {
        if (!dn || dn != of_stdout || console_set_on_cmdline)
                return false;
-       return add_preferred_console(name, index, NULL);
+       return !add_preferred_console(name, index, NULL);
 }
 EXPORT_SYMBOL_GPL(of_console_check);