Skip to content

Commit

Permalink
asus-laptop: merge with ACPICA table update
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Len Brown committed Feb 3, 2007
1 parent 274ec7a commit 894d79b
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions drivers/misc/asus-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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)) {
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 894d79b

Please sign in to comment.