diff options
| author | Len Brown <len.brown@intel.com> | 2007-02-03 02:13:53 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-02-03 02:13:53 -0500 |
| commit | 894d79bedd8b48fe838083f2d2a42ac09817c530 (patch) | |
| tree | e277432888ab3919fc5edebdeb9680c01a7e3259 /drivers/misc | |
| parent | 274ec7a8c07036bd02e8f2301456e443ef30b8a8 (diff) | |
| download | linux-894d79bedd8b48fe838083f2d2a42ac09817c530.tar.gz | |
asus-laptop: merge with ACPICA table update
No longer need a buffer for a copy of the DSDT, just a pointer to the mapped table. Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/asus-laptop.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/misc/asus-laptop.c b/drivers/misc/asus-laptop.c index b6243506add8..861c39935f99 100644 --- a/drivers/misc/asus-laptop.c +++ b/drivers/misc/asus-laptop.c @@ -777,7 +777,6 @@ static int asus_handle_init(char *name, acpi_handle * handle, static int asus_hotk_get_info(void) { struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; - struct acpi_buffer dsdt = { ACPI_ALLOCATE_BUFFER, NULL }; union acpi_object *model = NULL; int bsts_result, hwrs_result; char *string = NULL; @@ -791,11 +790,9 @@ static int asus_hotk_get_info(void) * HID), this bit will be moved. A global variable asus_info contains * the DSDT header. */ - status = acpi_get_table(ACPI_TABLE_ID_DSDT, 1, &dsdt); + status = acpi_get_table(ACPI_SIG_DSDT, 1, &asus_info); if (ACPI_FAILURE(status)) printk(ASUS_WARNING "Couldn't get the DSDT table header\n"); - else - asus_info = dsdt.pointer; /* We have to write 0 on init this far for all ASUS models */ if (!write_acpi_int(hotk->handle, "INIT", 0, &buffer)) { @@ -1014,8 +1011,6 @@ static void __exit asus_laptop_exit(void) sysfs_remove_group(&asuspf_device->dev.kobj, &asuspf_attribute_group); platform_device_unregister(asuspf_device); platform_driver_unregister(&asuspf_driver); - - kfree(asus_info); } static int asus_backlight_init(struct device *dev) |