system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-06 18:01:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

More thermal control updates for 6.3-rc1

Browse source 
- 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).
 -----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEE4fcc61cGeeHD/fCwgsRv/nhiVHEFAmQCNywSHHJqd0Byand5
 c29ja2kubmV0AAoJEILEb/54YlRxQlQQAIFDTFEThpzIoL6uiLsr9Omfqi0HsJ/H
 3X82UgUo6ra7LDl9J2WoP05e9ugzPhoBuZHCQOWAeYmqEk76Wc54tQQCXnxdDEVo
 gEUEq/ReKayMlk0uws2knqn7y7c/exFIwSLbZHAVpp6lpvLDv76ZBP/O410oYLjm
 3u7BXH3usQk51PVj0YkUY/Bw55Bpz+8z1v2FQier8CIrOnQyYW3Q5L2UKNON8DCy
 eB6wohuihpBEnecjhXdrLvU3iCMK7/a3+ztNRdNP4lJq5VDv8K9fl1Bt4/9N2KXv
 0zpAQ9FpTJwIoEK2ToULGF1i6OK7uw0wBC3akuyMdiyYifB6eIWPY/4YyzPIb9L3
 w+63VBcbv5IxXm3qB04gXbqk+i9oRTOlsfbgDsVeRaDM689c8X+JHTa3st0oFiYC
 HBS8LB3NivdxM1u3eN09zY17uM7taRD7mOD99cXWKCUBDFKzpk7iXkXAAh/+Ep3C
 pge0W1xprfPQHnz/E3GhxzwCjrffZFadPXrzPthP2N+FiYHCzv/K0l6yQrjpxoM6
 grMQss5pD5vyeJbGWgYgFO9qoMHUiM7T/wlZIcEWyunUw13zHK5KSQpsaUZu5afc
 5VUmCo3zxjke+vfiHLQsSrrHYfm1FDQhRJyRZ0n0UZypVLvRna1ASUZIotmvLJO1
 AIHrcI0OZQWp
 =dH0U
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2023-03-03 10:41:59 -08:00
parent 44b6f565e7 1467fb9603
commit 0a3f9a6b02
2 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/thermal/intel/Kconfig
View file

@ -73,7 +73,8 @@ endmenu
config INTEL_BXT_PMIC_THERMAL config INTEL_BXT_PMIC_THERMAL
tristate "Intel Broxton PMIC thermal driver" tristate "Intel Broxton PMIC thermal driver"
depends on X86 && INTEL_SOC_PMIC_BXTWC && REGMAP depends on X86 && INTEL_SOC_PMIC_BXTWC
select REGMAP
help help
Select this driver for Intel Broxton PMIC with ADC channels monitoring Select this driver for Intel Broxton PMIC with ADC channels monitoring
system temperature measurements and alerts. system temperature measurements and alerts.

12
drivers/thermal/intel/intel_quark_dts_thermal.c
View file

@ -400,22 +400,14 @@ MODULE_DEVICE_TABLE(x86cpu, qrk_thermal_ids);
static int __init intel_quark_thermal_init(void) static int __init intel_quark_thermal_init(void)
{ {
int err = 0;
if (!x86_match_cpu(qrk_thermal_ids) || !iosf_mbi_available()) if (!x86_match_cpu(qrk_thermal_ids) || !iosf_mbi_available())
return -ENODEV; return -ENODEV;
soc_dts = alloc_soc_dts(); soc_dts = alloc_soc_dts();
if (IS_ERR(soc_dts)) { if (IS_ERR(soc_dts))
err = PTR_ERR(soc_dts); return PTR_ERR(soc_dts);
goto err_free;
}
return 0; return 0;
err_free:
free_soc_dts(soc_dts);
return err;
} }
static void __exit intel_quark_thermal_exit(void) static void __exit intel_quark_thermal_exit(void)