On Mon, Feb 26, 2018 at 3:41 PM, Enric Balletbo i Serra <enric.balletbo@xxxxxxxxxxxxx> wrote: > 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> > --- > That's another attempt to land these to patches that were sent long time > ago but never got merged, although, apparently, there is no issue with > it. Latest discussion about these here: > > https://www.mail-archive.com/linux-kernel@xxxxxxxxxxxxxxx/msg1436081.html I can apply this one, but the other one has to go in through the Rui's tree. > Changes in v3: > - [1/2] Make sure tz->tz_enabled is set properly before registering the > zone (Zhang Rui) > > Changes in v2: > - [1/2] This patch is new from v1 > (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 551b71a24b85..1d8f185e96c6 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.16.1 > > -- > 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 -- 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
