Merge branch 'core/urgent' into smp/hotplug to pick up dependencies

[karo-tx-linux.git] / drivers / clocksource / versatile.c

diff --git a/drivers/clocksource/versatile.c b/drivers/clocksource/versatile.c
index 0a26d3dde6c005dd80c7a2af23aadb9b81bbe62d..220b490a81428ef8477b3140d49cc85919dbdc10 100644 (file)
--- a/drivers/clocksource/versatile.c
+++ b/drivers/clocksource/versatile.c
@@ -25,16 +25,18 @@ static u64 notrace versatile_sys_24mhz_read(void)
        return readl(versatile_sys_24mhz);
 }
 
-static void __init versatile_sched_clock_init(struct device_node *node)
+static int __init versatile_sched_clock_init(struct device_node *node)
 {
        void __iomem *base = of_iomap(node, 0);
 
        if (!base)
-               return;
+               return -ENXIO;
 
        versatile_sys_24mhz = base + SYS_24MHZ;
 
        sched_clock_register(versatile_sys_24mhz_read, 32, 24000000);
+
+       return 0;
 }
 CLOCKSOURCE_OF_DECLARE(vexpress, "arm,vexpress-sysreg",
                       versatile_sched_clock_init);