Commit 0a3f9a6b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 44b6f565 1467fb96

drivers/thermal/intel/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -73,7 +73,8 @@ endmenu 


config INTEL_BXT_PMIC_THERMAL

	tristate "Intel Broxton PMIC thermal driver"

	depends on X86 && INTEL_SOC_PMIC_BXTWC && REGMAP

	depends on X86 && INTEL_SOC_PMIC_BXTWC

	select REGMAP

	help

	  Select this driver for Intel Broxton PMIC with ADC channels monitoring

	  system temperature measurements and alerts.

drivers/thermal/intel/intel_quark_dts_thermal.c

+2 −10
Original line number Diff line number Diff line
@@ -400,22 +400,14 @@ MODULE_DEVICE_TABLE(x86cpu, qrk_thermal_ids); 


static int __init intel_quark_thermal_init(void)

{

	int err = 0;



	if (!x86_match_cpu(qrk_thermal_ids) || !iosf_mbi_available())

		return -ENODEV;



	soc_dts = alloc_soc_dts();

	if (IS_ERR(soc_dts)) {

		err = PTR_ERR(soc_dts);

		goto err_free;

	}

	if (IS_ERR(soc_dts))

		return PTR_ERR(soc_dts);



	return 0;



err_free:

	free_soc_dts(soc_dts);

	return err;

}



static void __exit intel_quark_thermal_exit(void)