tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds df8c66c4 f956cb99

+7 -3
+4
drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c
··· 237 237 if (ACPI_FAILURE(status)) 238 238 trip_cnt = 0; 239 239 else { 240 + int i; 241 + 240 242 int34x_thermal_zone->aux_trips = 241 243 kcalloc(trip_cnt, 242 244 sizeof(*int34x_thermal_zone->aux_trips), ··· 249 247 } 250 248 trip_mask = BIT(trip_cnt) - 1; 251 249 int34x_thermal_zone->aux_trip_nr = trip_cnt; 250 + for (i = 0; i < trip_cnt; ++i) 251 + int34x_thermal_zone->aux_trips[i] = THERMAL_TEMP_INVALID; 252 252 } 253 253 254 254 trip_cnt = int340x_thermal_read_trips(int34x_thermal_zone);
+1 -1
drivers/thermal/intel/x86_pkg_temp_thermal.c
··· 166 166 if (thres_reg_value) 167 167 *temp = zonedev->tj_max - thres_reg_value * 1000; 168 168 else 169 - *temp = 0; 169 + *temp = THERMAL_TEMP_INVALID; 170 170 pr_debug("sys_get_trip_temp %d\n", *temp); 171 171 172 172 return 0;
+1 -1
drivers/thermal/qcom/qcom-spmi-adc-tm5.c
··· 441 441 442 442 if (args.args_count != 1 || args.args[0] >= ADC5_MAX_CHANNEL) { 443 443 dev_err(dev, "%s: invalid ADC channel number %d\n", name, chan); 444 - return ret; 444 + return -EINVAL; 445 445 } 446 446 channel->adc_channel = args.args[0]; 447 447
+1 -1
drivers/thermal/ti-soc-thermal/ti-bandgap.c
··· 770 770 } 771 771 772 772 /** 773 - * ti_bandgap_alert_init() - setup and initialize talert handling 773 + * ti_bandgap_talert_init() - setup and initialize talert handling 774 774 * @bgp: pointer to struct ti_bandgap 775 775 * @pdev: pointer to device struct platform_device 776 776 *