[PATCH v3 1/2] acpi: thermal: initialize tz_enabled to 1
From: Enric Balletbo i Serra
Date: Mon Jul 03 2017 - 04:01:05 EST
From: Sameer Nanda <snanda@xxxxxxxxxxxx>
In the acpi_thermal_add path, acpi_thermal_get_info gets called before
acpi_thermal_register_thermal_zone. Since tz_enabled was getting set to
1 only in acpi_thermal_register_thermal_zone, acpi_thermal_get_info
ended up disabling thermal polling.
Moved setting of tz_enabled to 1 into acpi_thermal_add itself.
Signed-off-by: Sameer Nanda <snanda@xxxxxxxxxxxx>
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@xxxxxxxxxxxxx>
---
Changes since v2:
- Zhang Rui:
- Make sure tz->tz_enabled is set properly before registering the zone.
Changes since v1:
- This patch is new from v1 [1]
[1] https://patchwork.kernel.org/patch/9804229/
drivers/acpi/thermal.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 1d0417b..cd0fe92 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -930,8 +930,6 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)
if (ACPI_FAILURE(status))
return -ENODEV;
- tz->tz_enabled = 1;
-
dev_info(&tz->device->dev, "registered as thermal_zone%d\n",
tz->thermal_zone->id);
return 0;
@@ -1088,6 +1086,7 @@ static int acpi_thermal_add(struct acpi_device *device)
return -ENOMEM;
tz->device = device;
+ tz->tz_enabled = 1;
strcpy(tz->name, device->pnp.bus_id);
strcpy(acpi_device_name(device), ACPI_THERMAL_DEVICE_NAME);
strcpy(acpi_device_class(device), ACPI_THERMAL_CLASS);
--
2.9.3