diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-23 05:28:38 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-23 05:28:38 +0200 |
| commit | 5f50ef453dcb05115fc98f244b8f10bfacd4b8b7 (patch) | |
| tree | 1999a7e6d242198d48f0089c7995a50f339fa3e4 /drivers/acpi/asus_acpi.c | |
| parent | Merge branch 'i7300_idle' into test (diff) | |
| parent | asus-laptop: Fix the led behavior with value > 1 (diff) | |
| download | linux-5f50ef453dcb05115fc98f244b8f10bfacd4b8b7.tar.xz linux-5f50ef453dcb05115fc98f244b8f10bfacd4b8b7.zip | |
Merge branch 'misc' into test
Diffstat (limited to 'drivers/acpi/asus_acpi.c')
| -rw-r--r-- | drivers/acpi/asus_acpi.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c index 3f7adf683d4e..2377e8b917d7 100644 --- a/drivers/acpi/asus_acpi.c +++ b/drivers/acpi/asus_acpi.c @@ -1244,6 +1244,8 @@ static int asus_hotk_get_info(void) "default values\n", string); printk(KERN_NOTICE " send /proc/acpi/dsdt to the developers\n"); + kfree(model); + return -ENODEV; } hotk->methods = &model_conf[hotk->model]; return AE_OK; @@ -1321,7 +1323,7 @@ static int asus_hotk_add(struct acpi_device *device) hotk->handle = device->handle; strcpy(acpi_device_name(device), ACPI_HOTK_DEVICE_NAME); strcpy(acpi_device_class(device), ACPI_HOTK_CLASS); - acpi_driver_data(device) = hotk; + device->driver_data = hotk; hotk->device = device; result = asus_hotk_check(); |