From d66da388e386cf2293ed313c4d710e69c458dcd0 Mon Sep 17 00:00:00 2001
From: Ian Campbell <icampbell@arcom.com>
Date: Wed, 1 Jun 2005 02:39:25 -0500
Subject: [PATCH] --- yaml --- r: 3546 b: refs/heads/master c:
 b6cbf3ef4f270c0dfe84b26649e4fc0c25bb0844 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/input/misc/uinput.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 0b650d4b69d2..9893431d6400 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c30b4c10d9cfe5506fd421304935d8836773c7e5
+refs/heads/master: b6cbf3ef4f270c0dfe84b26649e4fc0c25bb0844
diff --git a/trunk/drivers/input/misc/uinput.c b/trunk/drivers/input/misc/uinput.c
index 158c8e845ff9..98710997aaaa 100644
--- a/trunk/drivers/input/misc/uinput.c
+++ b/trunk/drivers/input/misc/uinput.c
@@ -298,9 +298,11 @@ static int uinput_alloc_device(struct file *file, const char __user *buffer, siz
 	/* check if absmin/absmax/absfuzz/absflat are filled as
 	 * told in Documentation/input/input-programming.txt */
 	if (test_bit(EV_ABS, dev->evbit)) {
-		retval = uinput_validate_absbits(dev);
-		if (retval < 0)
+		int err = uinput_validate_absbits(dev);
+		if (err < 0) {
+			retval = err;
 			kfree(dev->name);
+		}
 	}
 
 exit: