Commit da48afb2 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpi-assorted' 

* 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
parents 7a330a54 524f42fa

drivers/acpi/ec.c

+4 −0
Original line number Diff line number Diff line
@@ -987,6 +987,10 @@ static struct dmi_system_id ec_dmi_table[] __initdata = { 
	ec_skip_dsdt_scan, "HP Folio 13", {

	DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),

	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},

	{},

};

drivers/acpi/thermal.c

+6 −6
Original line number Diff line number Diff line
@@ -475,14 +475,14 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag) 
			break;

	}



	if (flag & ACPI_TRIPS_DEVICES) {

		memset(&devices, 0, sizeof(struct acpi_handle_list));

	if ((flag & ACPI_TRIPS_DEVICES)

	    && acpi_has_method(tz->device->handle, "_TZD")) {

		memset(&devices, 0, sizeof(devices));

		status = acpi_evaluate_reference(tz->device->handle, "_TZD",

						NULL, &devices);

		if (memcmp(&tz->devices, &devices,

				sizeof(struct acpi_handle_list))) {

			memcpy(&tz->devices, &devices,

				sizeof(struct acpi_handle_list));

		if (ACPI_SUCCESS(status)

		    && memcmp(&tz->devices, &devices, sizeof(devices))) {

			tz->devices = devices;

			ACPI_THERMAL_TRIPS_EXCEPTION(flag, "device");

		}

	}