Merge tag 'xfs-for-linus-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / drivers / clocksource / mtk_timer.c

diff --git a/drivers/clocksource/mtk_timer.c b/drivers/clocksource/mtk_timer.c
index 7e583f8ea5f4ea0d99cd1ca7441d0c16d74975ac..90659493c59c4a5a284a16429d306a4d1eae5caa 100644 (file)
--- a/drivers/clocksource/mtk_timer.c
+++ b/drivers/clocksource/mtk_timer.c
@@ -181,7 +181,7 @@ static void mtk_timer_enable_irq(struct mtk_clock_event_device *evt, u8 timer)
                        evt->gpt_base + GPT_IRQ_EN_REG);
 }
 
-static void __init mtk_timer_init(struct device_node *node)
+static int __init mtk_timer_init(struct device_node *node)
 {
        struct mtk_clock_event_device *evt;
        struct resource res;
@@ -190,7 +190,7 @@ static void __init mtk_timer_init(struct device_node *node)
 
        evt = kzalloc(sizeof(*evt), GFP_KERNEL);
        if (!evt)
-               return;
+               return -ENOMEM;
 
        evt->dev.name = "mtk_tick";
        evt->dev.rating = 300;
@@ -248,7 +248,7 @@ static void __init mtk_timer_init(struct device_node *node)
 
        mtk_timer_enable_irq(evt, GPT_CLK_EVT);
 
-       return;
+       return 0;
 
 err_clk_disable:
        clk_disable_unprepare(clk);
@@ -262,5 +262,7 @@ err_mem:
        release_mem_region(res.start, resource_size(&res));
 err_kzalloc:
        kfree(evt);
+
+       return -EINVAL;
 }
 CLOCKSOURCE_OF_DECLARE(mtk_mt6577, "mediatek,mt6577-timer", mtk_timer_init);