From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 27 Mar 2023 11:47:11 +0000 (+0200)
Subject: Merge branch 'thermal-intel'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=85b52122e5426e15602c0b979012e50d7271ea1a;p=linux.git

Merge branch 'thermal-intel'

Merge an x86_pkg_temp_thermal Intel thermal driver fix (Zhang Rui).

* thermal-intel:
  thermal: intel: x86_pkg_temp_thermal: Add lower bound check for sysfs input
---

85b52122e5426e15602c0b979012e50d7271ea1a
diff --cc drivers/thermal/intel/x86_pkg_temp_thermal.c
index c4ec314441be5,128ee02596edf..11a7f8108bbbf
--- a/drivers/thermal/intel/x86_pkg_temp_thermal.c
+++ b/drivers/thermal/intel/x86_pkg_temp_thermal.c
@@@ -122,9 -122,9 +122,9 @@@ static int sys_get_curr_temp(struct the
  static int
  sys_set_trip_temp(struct thermal_zone_device *tzd, int trip, int temp)
  {
 -	struct zone_device *zonedev = tzd->devdata;
 +	struct zone_device *zonedev = thermal_zone_device_priv(tzd);
  	u32 l, h, mask, shift, intr;
- 	int tj_max, ret;
+ 	int tj_max, val, ret;
  
  	tj_max = intel_tcc_get_tjmax(zonedev->cpu);
  	if (tj_max < 0)