Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1522653 > unrolled thread

[PATCH 1/4] microblaze: Fix return value from xilinx_timer_init

Back to article view | Back to linux.kernel

Contents

  [PATCH 1/4] microblaze: Fix return value from xilinx_timer_init Michal Simek <michal.simek@xilinx.com> - 2016-11-15 14:00 +0100

#1522653 — [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@xilinx.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

[toc] | [standalone]

Back to top | Article view | linux.kernel

csiph-web