Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

[firefly-linux-kernel-4.4.55.git] / drivers / clocksource / timer-sun5i.c

diff --git a/drivers/clocksource/timer-sun5i.c b/drivers/clocksource/timer-sun5i.c
index 28aa4b7bb6020c416974ec52c8f80eb12366e705..0ffb4ea7c9253eb883afe47cd9682722f5c588c6 100644 (file)
--- a/drivers/clocksource/timer-sun5i.c
+++ b/drivers/clocksource/timer-sun5i.c
@@ -324,7 +324,7 @@ static void __init sun5i_timer_init(struct device_node *node)
        int irq;
 
        timer_base = of_io_request_and_map(node, 0, of_node_full_name(node));
-       if (!timer_base)
+       if (IS_ERR(timer_base))
                panic("Can't map registers");
 
        irq = irq_of_parse_and_map(node, 0);