diff --git a/drivers/hwmon/lm95234.c b/drivers/hwmon/lm95234.c
index db2aecdfb..ac169a994 100755
--- a/drivers/hwmon/lm95234.c
+++ b/drivers/hwmon/lm95234.c
@@ -301,8 +301,7 @@ static ssize_t tcrit2_store(struct device *dev, struct device_attribute *attr,
 	if (ret < 0)
 		return ret;
 
-	val = DIV_ROUND_CLOSEST(clamp_val(val, 0, (index ? 255 : 127) * 1000),
-				1000);
+	val = clamp_val(DIV_ROUND_CLOSEST(val, 1000), 0, index ? 255 : 127);
 
 	mutex_lock(&data->update_lock);
 	data->tcrit2[index] = val;
@@ -351,7 +350,7 @@ static ssize_t tcrit1_store(struct device *dev, struct device_attribute *attr,
 	if (ret < 0)
 		return ret;
 
-	val = DIV_ROUND_CLOSEST(clamp_val(val, 0, 255000), 1000);
+	val = clamp_val(DIV_ROUND_CLOSEST(val, 1000), 0, 255);
 
 	mutex_lock(&data->update_lock);
 	data->tcrit1[index] = val;
@@ -392,7 +391,7 @@ static ssize_t tcrit1_hyst_store(struct device *dev,
 	if (ret < 0)
 		return ret;
 
-	val = DIV_ROUND_CLOSEST(clamp_val(val, -255000, 255000), 1000);
+	val = DIV_ROUND_CLOSEST(val, 1000);
 	val = clamp_val((int)data->tcrit1[index] - val, 0, 31);
 
 	mutex_lock(&data->update_lock);
@@ -432,7 +431,7 @@ static ssize_t offset_store(struct device *dev, struct device_attribute *attr,
 		return ret;
 
 	/* Accuracy is 1/2 degrees C */
-	val = DIV_ROUND_CLOSEST(clamp_val(val, -64000, 63500), 500);
+	val = clamp_val(DIV_ROUND_CLOSEST(val, 500), -128, 127);
 
 	mutex_lock(&data->update_lock);
 	data->toffset[index] = val;