[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <fc98f601228b739924a0b18e46eb19a427ebdb77.1479214342.git.michal.simek@xilinx.com>
Date: Tue, 15 Nov 2016 13:52:29 +0100
From: Michal Simek <michal.simek@...inx.com>
To: linux-kernel@...r.kernel.org, monstr@...str.eu
Cc: Eric Anholt <eric@...olt.net>, Carlo Caione <carlo@...one.org>,
Chen-Yu Tsai <wens@...e.org>,
Daniel Lezcano <daniel.lezcano@...aro.org>
Subject: [PATCH 1/4] 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@...inx.com>
---
arch/microblaze/kernel/timer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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;
--
1.9.1
Powered by blists - more mailing lists