Patch "thermal: rockchip: fix a impossible condition caused by the warning" has been added to the 4.4-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
thermal: rockchip: fix a impossible condition caused by the warning
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
thermal-rockchip-fix-a-impossible-condition-caused-by-the-warning.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
43b4eb9fe719b107c8e5d49d1edbff0c135a42cbMon Sep 17 00:00:00 2001
From: Caesar Wang <[email protected]>
Date: Mon, 15 Feb 2016 15:33:28 +0800
Subject: thermal: rockchip: fix a impossible condition caused by the warning
From: Caesar Wang <[email protected]>
commit 43b4eb9fe719b107c8e5d49d1edbff0c135a42cb upstream.
As the Dan report the smatch check the thermal driver warning:drivers/thermal/rockchip_thermal.c:551 rockchip_configure_from_dt()
warn: impossible condition '(thermal->tshut_temp > ((~0 >> 1))) => (s32min-s32max > s32max)'
Although The shut_temp read from DT is u32,the temperature is currently represented as int not long in the thermal driver.
Let's change to make shut_temp instead of the thermal->tshut_temp for the condition.
("thermal: rockchip: consistently use int for temperatures")
--- drivers/thermal/rockchip_thermal.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/thermal/rockchip_thermal.c +5 -6
@@ -545,15 +545,14 @@ static int rockchip_configure_from_dt(st thermal->chip->tshut_temp); thermal->tshut_temp = thermal->chip->tshut_temp; }else { +if (shut_temp >INT_MAX ) { +dev_err (dev,"Invalid tshut temperature specified: %d\n" , + shut_temp); +return -ERANGE ; + } thermal->tshut_temp = shut_temp; } -if (thermal->tshut_temp >INT_MAX ) { -dev_err (dev,"Invalid tshut temperature specified: %d\n" , - thermal->tshut_temp); -return -ERANGE ; - } -if (of_property_read_u32 (np,"rockchip,hw-tshut-mode" , &tshut_mode)) { dev_warn(dev, "Missing tshut mode property, using default (%s)\n",
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/spi-rockchip-modify-dma-max-burst-to-1.patch queue-4.4/thermal-rockchip-fix-a-impossible-condition-caused-by-the-warning.patch