Skip to content

Commit 817e1af

Browse files
committed
Merge tag 'thermal-6.4-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull thermal control fixes from Rafael Wysocki: "These fix a NULL pointer dereference in the Intel powerclamp driver introduced during the 6.3 cycle and update MAINTAINERS to match recent code changes. Specifics: - Fix NULL pointer access in the Intel powerclamp thermal driver that occurs on attempts to set the cooling device state to 0 in the default configuration (Srinivas Pandruvada) - Drop the stale MAINTAINERS entry for the Intel Menlow thermal driver that has been removed recently (Lukas Bulwahn)" * tag 'thermal-6.4-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: MAINTAINERS: remove section INTEL MENLOW THERMAL DRIVER thermal: intel: powerclamp: Fix NULL pointer access issue
2 parents b49178e + 2492ba4 commit 817e1af

2 files changed

Lines changed: 4 additions & 6 deletions

File tree

MAINTAINERS

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10556,12 +10556,6 @@ F: drivers/hwmon/intel-m10-bmc-hwmon.c
1055610556
F: drivers/mfd/intel-m10-bmc*
1055710557
F: include/linux/mfd/intel-m10-bmc.h
1055810558

10559-
INTEL MENLOW THERMAL DRIVER
10560-
M: Sujith Thomas <sujith.thomas@intel.com>
10561-
L: linux-pm@vger.kernel.org
10562-
S: Supported
10563-
F: drivers/thermal/intel/intel_menlow.c
10564-
1056510559
INTEL P-Unit IPC DRIVER
1056610560
M: Zha Qipeng <qipeng.zha@intel.com>
1056710561
L: platform-driver-x86@vger.kernel.org

drivers/thermal/intel/intel_powerclamp.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -703,6 +703,10 @@ static int powerclamp_set_cur_state(struct thermal_cooling_device *cdev,
703703

704704
new_target_ratio = clamp(new_target_ratio, 0UL,
705705
(unsigned long) (max_idle - 1));
706+
707+
if (powerclamp_data.target_ratio == new_target_ratio)
708+
goto exit_set;
709+
706710
if (!powerclamp_data.target_ratio && new_target_ratio > 0) {
707711
pr_info("Start idle injection to reduce power\n");
708712
powerclamp_data.target_ratio = new_target_ratio;

0 commit comments

Comments
 (0)