From d240a1eb1023de5f75787a01b2b976129af747ce Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Sat, 13 May 2006 22:56:00 -0400
Subject: [PATCH] --- yaml --- r: 29146 b: refs/heads/master c:
 ebd5f2ca811b75f7145fa487748f26430c584a72 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 8591615f92bc..2547ea570a91 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6835052a6aa00536343b6d2127fc65cd814a040
+refs/heads/master: ebd5f2ca811b75f7145fa487748f26430c584a72
diff --git a/trunk/drivers/acpi/asus_acpi.c b/trunk/drivers/acpi/asus_acpi.c
index f4c87750dbf2..fccbf938ea04 100644
--- a/trunk/drivers/acpi/asus_acpi.c
+++ b/trunk/drivers/acpi/asus_acpi.c
@@ -1229,7 +1229,7 @@ static int __init asus_acpi_init(void)
 	if (result < 1) {
 		acpi_bus_unregister_driver(&asus_hotk_driver);
 		remove_proc_entry(PROC_ASUS, acpi_root_dir);
-		return -ENODEV;
+		return result;
 	}
 
 	return 0;