From 9295f672ebbaf74f5c5cad52d0be62edf68a9429 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Sat, 24 Jun 2006 19:36:00 -0400
Subject: [PATCH] --- yaml --- r: 31438 b: refs/heads/master c:
 5e7d8818114f08ad9078d2c1a8a88d78d49de8dc h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/acpi/asus_acpi.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5cac44de3569..cbdc9f9fdfd6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8406b4485730031d91872086456bd052948686b
+refs/heads/master: 5e7d8818114f08ad9078d2c1a8a88d78d49de8dc
diff --git a/trunk/drivers/acpi/asus_acpi.c b/trunk/drivers/acpi/asus_acpi.c
index 839f423d738d..055cfd5c8766 100644
--- a/trunk/drivers/acpi/asus_acpi.c
+++ b/trunk/drivers/acpi/asus_acpi.c
@@ -1232,7 +1232,7 @@ static int __init asus_acpi_init(void)
 	result = acpi_bus_register_driver(&asus_hotk_driver);
 	if (result < 0) {
 		remove_proc_entry(PROC_ASUS, acpi_root_dir);
-		return -ENODEV;
+		return result;
 	}
 
 	/*