1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c
index b58e3fb9b311..433085a97626 100644
--- a/drivers/thermal/rockchip_thermal.c
+++ b/drivers/thermal/rockchip_thermal.c
@@ -693,15 +693,14 @@ static int rockchip_configure_from_dt(struct device *dev,
                          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",