Upgrade to 4.4.50-rt62

[kvmfornfv.git] / kernel / drivers / hwmon / nct7802.c

diff --git a/kernel/drivers/hwmon/nct7802.c b/kernel/drivers/hwmon/nct7802.c
index 3ce33d2..12b94b0 100644 (file)
--- a/kernel/drivers/hwmon/nct7802.c
+++ b/kernel/drivers/hwmon/nct7802.c
@@ -259,13 +259,15 @@ static int nct7802_read_fan_min(struct nct7802_data *data, u8 reg_fan_low,
                ret = 0;
        else if (ret)
                ret = DIV_ROUND_CLOSEST(1350000U, ret);
+       else
+               ret = 1350000U;
 abort:
        mutex_unlock(&data->access_lock);
        return ret;
 }
 
 static int nct7802_write_fan_min(struct nct7802_data *data, u8 reg_fan_low,
-                                u8 reg_fan_high, unsigned int limit)
+                                u8 reg_fan_high, unsigned long limit)
 {
        int err;
 
@@ -326,8 +328,8 @@ static int nct7802_write_voltage(struct nct7802_data *data, int nr, int index,
        int shift = 8 - REG_VOLTAGE_LIMIT_MSB_SHIFT[index - 1][nr];
        int err;
 
+       voltage = clamp_val(voltage, 0, 0x3ff * nct7802_vmul[nr]);
        voltage = DIV_ROUND_CLOSEST(voltage, nct7802_vmul[nr]);
-       voltage = clamp_val(voltage, 0, 0x3ff);
 
        mutex_lock(&data->access_lock);
        err = regmap_write(data->regmap,
@@ -402,7 +404,7 @@ static ssize_t store_temp(struct device *dev, struct device_attribute *attr,
        if (err < 0)
                return err;
 
-       val = clamp_val(DIV_ROUND_CLOSEST(val, 1000), -128, 127);
+       val = DIV_ROUND_CLOSEST(clamp_val(val, -128000, 127000), 1000);
 
        err = regmap_write(data->regmap, nr, val & 0xff);
        return err ? : count;