diff options
| author | Alan Jenkins <alan-jenkins@tuffmail.co.uk> | 2009-12-03 07:44:49 +0000 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-12-09 15:54:30 -0500 |
| commit | 5a4a9f6fd3dedefe06aed0e35c76bb6e0177adb6 (patch) | |
| tree | 087a2d6919c8b949d4bb565222025869458196ff /drivers/platform/x86/asus_acpi.c | |
| parent | b7fab7a0703a9d3a3b4b59aa2f7b098b2b83b8fe (diff) | |
| download | linux-0-day-5a4a9f6fd3dedefe06aed0e35c76bb6e0177adb6.tar.gz linux-0-day-5a4a9f6fd3dedefe06aed0e35c76bb6e0177adb6.tar.xz | |
asus-acpi: Remove uneccesary acpi_disabled checks
acpi_bus_register_driver() already checks acpi_disabled, so acpi bus
drivers don't need to.
Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/platform/x86/asus_acpi.c')
| -rw-r--r-- | drivers/platform/x86/asus_acpi.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/platform/x86/asus_acpi.c b/drivers/platform/x86/asus_acpi.c index 25a7d57fe4494..783243f7e7a4b 100644 --- a/drivers/platform/x86/asus_acpi.c +++ b/drivers/platform/x86/asus_acpi.c @@ -1416,21 +1416,17 @@ static int __init asus_acpi_init(void) { int result; - if (acpi_disabled) - return -ENODEV; + result = acpi_bus_register_driver(&asus_hotk_driver); + if (result < 0) + return result; asus_proc_dir = proc_mkdir(PROC_ASUS, acpi_root_dir); if (!asus_proc_dir) { printk(KERN_ERR "Asus ACPI: Unable to create /proc entry\n"); + acpi_bus_unregister_driver(&asus_hotk_driver); return -ENODEV; } - result = acpi_bus_register_driver(&asus_hotk_driver); - if (result < 0) { - remove_proc_entry(PROC_ASUS, acpi_root_dir); - return result; - } - /* * This is a bit of a kludge. We only want this module loaded * for ASUS systems, but there's currently no way to probe the |