On Monday, August 26, 2013 10:14:30 AM tianyu.lan@xxxxxxxxx wrote:
> From: Lan Tianyu <tianyu.lan@xxxxxxxxx>
>
> Some machines don't provide _TZD. So add check of "_TZD" availability
> before doing futher operations. This patch also adds the check of
> evaluating result.
>
> Signed-off-by: Lan Tianyu <tianyu.lan@xxxxxxxxx>
> ---
> Change sicne v1:
> Arrange the whitespace, using "tz->devices = devices"
> instead of memcpy() and sizeof(devices) instead of sizeof(struct ...)
>
> drivers/acpi/thermal.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
> index 09f9340..177ecca 100644
> --- a/drivers/acpi/thermal.c
> +++ b/drivers/acpi/thermal.c
> @@ -492,14 +492,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))) {
No line break here, please. Do this:
if (ACPI_SUCCESS(status)
&& memcmp(&tz->devices, &devices, sizeof(devices))) {
> + tz->devices = devices;
> ACPI_THERMAL_TRIPS_EXCEPTION(flag, "device");
> }
> }
Thanks,
Rafael
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
