Commit 578b333b authored Mar 28, 2006 by Bjorn Helgaas Committed by Len Brown Apr 01, 2006

ACPI: update asus_acpi driver registration to unload on failure



Remove the assumption that acpi_bus_register_driver() returns the number of
devices claimed.  Returning the count is unreliable because devices may be
hot-plugged in the future (admittedly not applicable for this driver).

Since the hardware for this driver is not hot-pluggable, determine whether the
hardware is present by noticing calls to the .add() method.  It would be
better to probe the ACPI namespace for the ASUS HIDs, and load the driver only
when we find one, but ACPI doesn't support that yet.

I don't have an ASUS laptop to test on, but on my HP dl360, it does report the
appropriate error when attempting to load the module:

    $ sudo insmod drivers/acpi/asus_acpi.ko
    insmod: error inserting 'drivers/acpi/asus_acpi.ko': -1 No such device

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Len Brown <len.brown@intel.com>

parent 9d9f749b

drivers/acpi/asus_acpi.c

+17 −1

Original line number	Diff line number	Diff line
		@@ -1119,6 +1119,8 @@ static int __init asus_hotk_check(void)
		return result;
		}

		static int asus_hotk_found;

		static int __init asus_hotk_add(struct acpi_device *device)
		{
		acpi_status status = AE_OK;
		@@ -1180,6 +1182,8 @@ static int __init asus_hotk_add(struct acpi_device *device)
		}
		}

		asus_hotk_found = 1;

		end:
		if (result) {
		kfree(hotk);
		@@ -1226,7 +1230,19 @@ static int __init asus_acpi_init(void)
		asus_proc_dir->owner = THIS_MODULE;

		result = acpi_bus_register_driver(&asus_hotk_driver);
		if (result < 1) {
		if (result < 0) {
		remove_proc_entry(PROC_ASUS, acpi_root_dir);
		return -ENODEV;
		}

		/*
		* 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
		* ACPI namespace for ASUS HIDs. So we just return failure if
		* we didn't find one, which will cause the module to be
		* unloaded.
		*/
		if (!asus_hotk_found) {
		acpi_bus_unregister_driver(&asus_hotk_driver);
		remove_proc_entry(PROC_ASUS, acpi_root_dir);
		return -ENODEV;

Admin message