renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-14 08:13:56 +08:00
Code

Merge branch 'acpi-assorted'

Browse Source 
* acpi-assorted:
  ACPI / EC: Add ASUSTEK L4R to quirk list in order to validate ECDT
  ACPI / thermal: Add check of "_TZD" availability and evaluating result
This commit is contained in:
Rafael J. Wysocki 2013-08-30 14:13:50 +02:00
commit da48afb26b
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/acpi/ec.c
View File

@ -987,6 +987,10 @@ static struct dmi_system_id ec_dmi_table[] __initdata = {
ec_skip_dsdt_scan, "HP Folio 13", { ec_skip_dsdt_scan, "HP Folio 13", {
DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
DMI_MATCH(DMI_PRODUCT_NAME, "HP Folio 13"),}, NULL}, DMI_MATCH(DMI_PRODUCT_NAME, "HP Folio 13"),}, NULL},
{
ec_validate_ecdt, "ASUS hardware", {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTek Computer Inc."),
DMI_MATCH(DMI_PRODUCT_NAME, "L4R"),}, NULL},
{}, {},
}; };

12
drivers/acpi/thermal.c
View File

@ -475,14 +475,14 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
break; break;
} }
if (flag & ACPI_TRIPS_DEVICES) { if ((flag & ACPI_TRIPS_DEVICES)
memset(&devices, 0, sizeof(struct acpi_handle_list)); && acpi_has_method(tz->device->handle, "_TZD")) {
memset(&devices, 0, sizeof(devices));
status = acpi_evaluate_reference(tz->device->handle, "_TZD", status = acpi_evaluate_reference(tz->device->handle, "_TZD",
NULL, &devices); NULL, &devices);
if (memcmp(&tz->devices, &devices, if (ACPI_SUCCESS(status)
sizeof(struct acpi_handle_list))) { && memcmp(&tz->devices, &devices, sizeof(devices))) {
memcpy(&tz->devices, &devices, tz->devices = devices;
sizeof(struct acpi_handle_list));
ACPI_THERMAL_TRIPS_EXCEPTION(flag, "device"); ACPI_THERMAL_TRIPS_EXCEPTION(flag, "device");
} }
} }