OSDN Git Service

clk: asm9260: Fix of_io_request_and_map error check
authorMaxime Ripard <maxime.ripard@free-electrons.com>
Sat, 2 May 2015 15:03:21 +0000 (17:03 +0200)
committerStephen Boyd <sboyd@codeaurora.org>
Wed, 13 May 2015 19:32:52 +0000 (12:32 -0700)
of_io_request_and map returns an error pointer, but the current code assumes
that on error the returned pointer will be NULL.

Obviously, that makes the check completely useless. Change the test to actually
check for the proper error code.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Mike Turquette <mturquette@linaro.org>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Cc: linux-clk@vger.kernel.org
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
drivers/clk/clk-asm9260.c

index 88f4ff6..90897af 100644 (file)
@@ -274,7 +274,7 @@ static void __init asm9260_acc_init(struct device_node *np)
        u32 accuracy = 0;
 
        base = of_io_request_and_map(np, 0, np->name);
-       if (!base)
+       if (IS_ERR(base))
                panic("%s: unable to map resource", np->name);
 
        /* register pll */