]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
thermal: hwmon: Properly report critical temperature in sysfs
authorKrzysztof Kozlowski <krzk@kernel.org>
Tue, 22 Nov 2016 17:22:44 +0000 (19:22 +0200)
committerSasha Levin <alexander.levin@verizon.com>
Fri, 13 Jan 2017 01:56:54 +0000 (20:56 -0500)
commitb4fa7414cb796668b06e23275d2c1775ae9814c8
tree546802c804075124338c0d6cb37ba98d54c8f7b6
parent3225aec938da2b7135168906057015eb27b4918e
thermal: hwmon: Properly report critical temperature in sysfs

[ Upstream commit f37fabb8643eaf8e3b613333a72f683770c85eca ]

In the critical sysfs entry the thermal hwmon was returning wrong
temperature to the user-space.  It was reporting the temperature of the
first trip point instead of the temperature of critical trip point.

For example:
/sys/class/hwmon/hwmon0/temp1_crit:50000
/sys/class/thermal/thermal_zone0/trip_point_0_temp:50000
/sys/class/thermal/thermal_zone0/trip_point_0_type:active
/sys/class/thermal/thermal_zone0/trip_point_3_temp:120000
/sys/class/thermal/thermal_zone0/trip_point_3_type:critical

Since commit e68b16abd91d ("thermal: add hwmon sysfs I/F") the driver
have been registering a sysfs entry if get_crit_temp() callback was
provided.  However when accessed, it was calling get_trip_temp() instead
of the get_crit_temp().

Fixes: e68b16abd91d ("thermal: add hwmon sysfs I/F")
Cc: <stable@vger.kernel.org>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
drivers/thermal/thermal_hwmon.c