From 48f65bda23079834588e84fe5e9ec4cf36eaffc4 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Mon, 5 Jul 2010 15:29:00 +0800
Subject: [PATCH] --- yaml --- r: 202498 b: refs/heads/master c:
 45036ae14a0161e9a0f542b6cb7ed55790f73f5b h: refs/heads/master v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/platform/x86/asus-laptop.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index a6b87c1254c5..0b0ba54fac70 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8700e1612e19f752be507f7fdcd8b48ba1b425ee
+refs/heads/master: 45036ae14a0161e9a0f542b6cb7ed55790f73f5b
diff --git a/trunk/drivers/platform/x86/asus-laptop.c b/trunk/drivers/platform/x86/asus-laptop.c
index 6aba24618416..b756e07d41b4 100644
--- a/trunk/drivers/platform/x86/asus-laptop.c
+++ b/trunk/drivers/platform/x86/asus-laptop.c
@@ -1124,7 +1124,7 @@ static int asus_input_init(struct asus_laptop *asus)
 	input = input_allocate_device();
 	if (!input) {
 		pr_info("Unable to allocate input device\n");
-		return 0;
+		return -ENOMEM;
 	}
 	input->name = "Asus Laptop extra buttons";
 	input->phys = ASUS_LAPTOP_FILE "/input0";
@@ -1135,20 +1135,20 @@ static int asus_input_init(struct asus_laptop *asus)
 	error = sparse_keymap_setup(input, asus_keymap, NULL);
 	if (error) {
 		pr_err("Unable to setup input device keymap\n");
-		goto err_keymap;
+		goto err_free_dev;
 	}
 	error = input_register_device(input);
 	if (error) {
 		pr_info("Unable to register input device\n");
-		goto err_device;
+		goto err_free_keymap;
 	}
 
 	asus->inputdev = input;
 	return 0;
 
-err_keymap:
+err_free_keymap:
 	sparse_keymap_free(input);
-err_device:
+err_free_dev:
 	input_free_device(input);
 	return error;
 }