From d1cff23a37517bb2948da540736278356e0dcbf4 Mon Sep 17 00:00:00 2001
From: Thomas Meyer <thomas@m3y3r.de>
Date: Mon, 6 Aug 2012 19:51:16 +0200
Subject: [PATCH] --- yaml --- r: 326223 b: refs/heads/master c:
 e786f6bfd62e4da8c07c8e208a881c2b855a534a h: refs/heads/master i:   326221:
 1a1c61c8fe5b0ffd9a1a87983ae98f113d4094a7   326219:
 4bf267d85e1c1647c94c294b5eb58229796f9f95   326215:
 4e8b76e41b2f8d5a499163e7f09a0f191cf3929a   326207:
 3e799828e3fe6acde0ae80ea0bc680d5236009d9 v: v3

---
 [refs]                       | 2 +-
 trunk/arch/m68k/q40/config.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 1cfae6e22b86..3b14c8e32ce2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 27b05e4d202427a8a8b03487e70f256f586e7ad8
+refs/heads/master: e786f6bfd62e4da8c07c8e208a881c2b855a534a
diff --git a/trunk/arch/m68k/q40/config.c b/trunk/arch/m68k/q40/config.c
index 8a1ce327c963..1adb5b7b0d1a 100644
--- a/trunk/arch/m68k/q40/config.c
+++ b/trunk/arch/m68k/q40/config.c
@@ -338,9 +338,6 @@ static __init int q40_add_kbd_device(void)
 		return -ENODEV;
 
 	pdev = platform_device_register_simple("q40kbd", -1, NULL, 0);
-	if (IS_ERR(pdev))
-		return PTR_ERR(pdev);
-
-	return 0;
+	return PTR_RET(pdev);
 }
 arch_initcall(q40_add_kbd_device);