Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'thermal-6.3-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull more thermal control updates from Rafael Wysocki:
"These fix two issues in the Intel thermal control drivers.
Specifics:
- Fix an error pointer dereference in the quark_dts Intel thermal
driver (Dan Carpenter)
- Fix the intel_bxt_pmic_thermal driver Kconfig entry to select
REGMAP which is not user-visible instead of depending on it (Randy
Dunlap)"
* tag 'thermal-6.3-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
thermal: intel: BXT_PMIC: select REGMAP instead of depending on it
thermal: intel: quark_dts: fix error pointer dereference
+4
-11
+2
-1
drivers/thermal/intel/Kconfig
+2
-1
drivers/thermal/intel/Kconfig
···
73
73
74
74
config INTEL_BXT_PMIC_THERMAL
75
75
tristate "Intel Broxton PMIC thermal driver"
76
-
depends on X86 && INTEL_SOC_PMIC_BXTWC && REGMAP
76
+
depends on X86 && INTEL_SOC_PMIC_BXTWC
77
+
select REGMAP
77
78
help
78
79
Select this driver for Intel Broxton PMIC with ADC channels monitoring
79
80
system temperature measurements and alerts.
+2
-10
drivers/thermal/intel/intel_quark_dts_thermal.c
+2
-10
drivers/thermal/intel/intel_quark_dts_thermal.c
···
400
400
401
401
static int __init intel_quark_thermal_init(void)
402
402
{
403
-
int err = 0;
404
-
405
403
if (!x86_match_cpu(qrk_thermal_ids) || !iosf_mbi_available())
406
404
return -ENODEV;
407
405
408
406
soc_dts = alloc_soc_dts();
409
-
if (IS_ERR(soc_dts)) {
410
-
err = PTR_ERR(soc_dts);
411
-
goto err_free;
412
-
}
407
+
if (IS_ERR(soc_dts))
408
+
return PTR_ERR(soc_dts);
413
409
414
410
return 0;
415
-
416
-
err_free:
417
-
free_soc_dts(soc_dts);
418
-
return err;
419
411
}
420
412
421
413
static void __exit intel_quark_thermal_exit(void)