From: Thomas Renninger <trenn@suse.de>
Date: Thu, 8 Mar 2007 16:57:31 +0000 (+0100)
Subject: ACPI: asus_acpi: Do not load if no device has been found
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e4d49531dcc2f334205d99614164ea900216b1cb;p=openwrt%2Fstaging%2Fblogic.git

ACPI: asus_acpi: Do not load if no device has been found

asus_acpi_init() has a hack to prevent the driver from loading
when asus_hotk_add() fails.  However, it was returning the successful
return value of acpi_bug_registger_driver() on failure.  This caused
an oops on unload.  Instead it should return -ENODEV.

Signed-off-by: Thomas Renninger <trenn@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>
---

diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c
index 6d7d4157e049..45360dfab2c6 100644
--- a/drivers/acpi/asus_acpi.c
+++ b/drivers/acpi/asus_acpi.c
@@ -1398,7 +1398,7 @@ static int __init asus_acpi_init(void)
 	if (!asus_hotk_found) {
 		acpi_bus_unregister_driver(&asus_hotk_driver);
 		remove_proc_entry(PROC_ASUS, acpi_root_dir);
-		return result;
+		return -ENODEV;
 	}
 
 	asus_backlight_device = backlight_device_register("asus",NULL,NULL,