]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
microblaze: Fix return value from xilinx_timer_init
authorMichal Simek <michal.simek@xilinx.com>
Tue, 15 Nov 2016 10:53:54 +0000 (11:53 +0100)
committerMichal Simek <michal.simek@xilinx.com>
Tue, 15 Nov 2016 12:58:24 +0000 (13:58 +0100)
The patch
"clocksource/drivers/microblaze: Convert init function to return error"
(sha1: 0586421746ef2bc33898d2d7f3dbb0eec6b234c3)
introduced return value and this one was forgetten to convert.

This patch also remove compilation warning:
arch/microblaze/kernel/timer.c: In function 'xilinx_timer_init':
arch/microblaze/kernel/timer.c:262:3: warning: 'return' with no value,
 in function returning non-void [-Wreturn-type]

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
arch/microblaze/kernel/timer.c

index 5bbf38b916ef36839396c01cfd5bc105245ae934..9e954959f60504cd7cf04d1c8c58f897bf6cea76 100644 (file)
@@ -259,7 +259,7 @@ static int __init xilinx_timer_init(struct device_node *timer)
        int ret;
 
        if (initialized)
-               return;
+               return -EINVAL;
 
        initialized = 1;