Skip to content

Commit df8c66c

Browse files
committed
Merge tag 'thermal-v5.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux
Pull thermal fixes from Daniel Lezcano: - Fix uninitialized error code value for the SPMI adc driver (Yang Yingliang) - Fix kernel doc warning (Yang Li) - Fix wrong read-write thermal trip point initialization (Srinivas Pandruvada) * tag 'thermal-v5.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux: thermal/drivers/qcom: Fix error code in adc_tm5_get_dt_channel_data() thermal/ti-soc-thermal: Fix kernel-doc thermal/drivers/intel: Initialize RW trip to THERMAL_TEMP_INVALID
2 parents f956cb9 + 5d8db38 commit df8c66c

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,8 @@ struct int34x_thermal_zone *int340x_thermal_zone_add(struct acpi_device *adev,
237237
if (ACPI_FAILURE(status))
238238
trip_cnt = 0;
239239
else {
240+
int i;
241+
240242
int34x_thermal_zone->aux_trips =
241243
kcalloc(trip_cnt,
242244
sizeof(*int34x_thermal_zone->aux_trips),
@@ -247,6 +249,8 @@ struct int34x_thermal_zone *int340x_thermal_zone_add(struct acpi_device *adev,
247249
}
248250
trip_mask = BIT(trip_cnt) - 1;
249251
int34x_thermal_zone->aux_trip_nr = trip_cnt;
252+
for (i = 0; i < trip_cnt; ++i)
253+
int34x_thermal_zone->aux_trips[i] = THERMAL_TEMP_INVALID;
250254
}
251255

252256
trip_cnt = int340x_thermal_read_trips(int34x_thermal_zone);

drivers/thermal/intel/x86_pkg_temp_thermal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ static int sys_get_trip_temp(struct thermal_zone_device *tzd,
166166
if (thres_reg_value)
167167
*temp = zonedev->tj_max - thres_reg_value * 1000;
168168
else
169-
*temp = 0;
169+
*temp = THERMAL_TEMP_INVALID;
170170
pr_debug("sys_get_trip_temp %d\n", *temp);
171171

172172
return 0;

drivers/thermal/qcom/qcom-spmi-adc-tm5.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ static int adc_tm5_get_dt_channel_data(struct adc_tm5_chip *adc_tm,
441441

442442
if (args.args_count != 1 || args.args[0] >= ADC5_MAX_CHANNEL) {
443443
dev_err(dev, "%s: invalid ADC channel number %d\n", name, chan);
444-
return ret;
444+
return -EINVAL;
445445
}
446446
channel->adc_channel = args.args[0];
447447

drivers/thermal/ti-soc-thermal/ti-bandgap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -770,7 +770,7 @@ static int ti_bandgap_tshut_init(struct ti_bandgap *bgp,
770770
}
771771

772772
/**
773-
* ti_bandgap_alert_init() - setup and initialize talert handling
773+
* ti_bandgap_talert_init() - setup and initialize talert handling
774774
* @bgp: pointer to struct ti_bandgap
775775
* @pdev: pointer to device struct platform_device
776776
*

0 commit comments

Comments
 (0)