diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-01-30 19:47:43 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-02-02 15:31:04 +0100 |
| commit | 1bcebcab887ba4c4d790d7ccb055303c5dc7dbbb (patch) | |
| tree | d85e25728cad6298eeefcf4287cacfca56a81521 | |
| parent | d0009d14e9853bb5f553a36df9fb7791deffc594 (diff) | |
| download | linux-stable-1bcebcab887ba4c4d790d7ccb055303c5dc7dbbb.tar.gz linux-stable-1bcebcab887ba4c4d790d7ccb055303c5dc7dbbb.tar.bz2 linux-stable-1bcebcab887ba4c4d790d7ccb055303c5dc7dbbb.zip | |
thermal: intel: int340x: Improve int340x_thermal_set_trip_temp()
Instead of using snprintf() to populate the ACPI object name in
int340x_thermal_set_trip_temp(), use an appropriate initializer
and make the function fail if its trip argument is greater than 9,
because ACPI object names can only be 4 characters long and it does
not make sense to even try to evaluate objects with longer names (that
argument is guaranteed to be non-negative, because it comes from the
thermal code that will not pass negative trip numbers to zone
callbacks).
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Tested-by: Zhang Rui <rui.zhang@intel.com>
Reviewed-by: Zhang Rui <rui.zhang@intel.com>
| -rw-r--r-- | drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c b/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c index 0e622bb560af..00665967ca52 100644 --- a/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c +++ b/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c @@ -42,10 +42,12 @@ static int int340x_thermal_set_trip_temp(struct thermal_zone_device *zone, int trip, int temp) { struct int34x_thermal_zone *d = zone->devdata; + char name[] = {'P', 'A', 'T', '0' + trip, '\0'}; acpi_status status; - char name[10]; - snprintf(name, sizeof(name), "PAT%d", trip); + if (trip > 9) + return -EINVAL; + status = acpi_execute_simple_method(d->adev->handle, name, millicelsius_to_deci_kelvin(temp)); if (ACPI_FAILURE(status)) |