Skip to content

Commit

Permalink
ACPI: Thermal: Drop concurrent thermal checks
Browse files Browse the repository at this point in the history
Fix for #3686, where get_temperature() may cause thermal notify, which
causes one more get_temperature().

Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>
  • Loading branch information
Alexey Starikovskiy authored and Len Brown committed Sep 5, 2007
1 parent 21bc42a commit 6e21578
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions drivers/acpi/thermal.c
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ struct acpi_thermal {
struct acpi_thermal_trips trips;
struct acpi_handle_list devices;
struct timer_list timer;
struct mutex lock;
};

static const struct file_operations acpi_thermal_state_fops = {
Expand Down Expand Up @@ -721,11 +722,15 @@ static void acpi_thermal_check(void *data)
return;
}

/* Check if someone else is already running */
if (!mutex_trylock(&tz->lock))
return;

state = tz->state;

result = acpi_thermal_get_temperature(tz);
if (result)
return;
goto unlock;

memset(&tz->state, 0, sizeof(tz->state));

Expand Down Expand Up @@ -816,8 +821,8 @@ static void acpi_thermal_check(void *data)
add_timer(&(tz->timer));
}
}

return;
unlock:
mutex_unlock(&tz->lock);
}

/* --------------------------------------------------------------------------
Expand Down Expand Up @@ -1254,7 +1259,7 @@ static int acpi_thermal_add(struct acpi_device *device)
strcpy(acpi_device_name(device), ACPI_THERMAL_DEVICE_NAME);
strcpy(acpi_device_class(device), ACPI_THERMAL_CLASS);
acpi_driver_data(device) = tz;

mutex_init(&tz->lock);
result = acpi_thermal_get_info(tz);
if (result)
goto end;
Expand Down Expand Up @@ -1324,7 +1329,7 @@ static int acpi_thermal_remove(struct acpi_device *device, int type)
}

acpi_thermal_remove_fs(device);

mutex_destroy(&tz->lock);
kfree(tz);
return 0;
}
Expand Down

0 comments on commit 6e21578

Please sign in to comment.