diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2016-11-15 11:53:54 +0100 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2016-11-15 13:58:24 +0100 |
| commit | 63b7c83ebea06d23dfd1548391515614b5765ad8 (patch) | |
| tree | 17fe9a1536235ed822a78d55dd70f0bca630d6f3 /arch/microblaze | |
| parent | a25f0944ba9b1d8a6813fd6f1a86f1bd59ac25a6 (diff) | |
| download | linux-63b7c83ebea06d23dfd1548391515614b5765ad8.tar.gz linux-63b7c83ebea06d23dfd1548391515614b5765ad8.tar.bz2 linux-63b7c83ebea06d23dfd1548391515614b5765ad8.zip | |
microblaze: Fix return value from xilinx_timer_init
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>
Diffstat (limited to 'arch/microblaze')
| -rw-r--r-- | arch/microblaze/kernel/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c index 5bbf38b916ef..9e954959f605 100644 --- a/arch/microblaze/kernel/timer.c +++ b/arch/microblaze/kernel/timer.c @@ -259,7 +259,7 @@ static int __init xilinx_timer_init(struct device_node *timer) int ret; if (initialized) - return; + return -EINVAL; initialized = 1; |