Merge branch 'next' into for-linus

[firefly-linux-kernel-4.4.55.git] / drivers / clk / clk-asm9260.c

diff --git a/drivers/clk/clk-asm9260.c b/drivers/clk/clk-asm9260.c
index 88f4ff6916fe72ff840dae2906f7a3082beee722..90897af8d9f74b6eb1ec7b4ee309c04f500aea4c 100644 (file)
--- a/drivers/clk/clk-asm9260.c
+++ b/drivers/clk/clk-asm9260.c
@@ -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 */