4 files changed, 38 insertions, 20 deletions

diff --git a/drivers/hwmon/f71805f.c b/drivers/hwmon/f71805f.c
index 92f949767ece..6dbfd3e516e4 100644
--- a/drivers/hwmon/f71805f.c
+++ b/drivers/hwmon/f71805f.c
@@ -283,11 +283,11 @@ static inline long temp_from_reg(u8 reg)
 
 static inline u8 temp_to_reg(long val)
 {
-        if (val < 0)
-                val = 0;
-        else if (val > 1000 * 0xff)
-                val = 0xff;
-        return ((val + 500) / 1000);
+        if (val <= 0)
+                return 0;
+        if (val >= 1000 * 0xff)
+                return 0xff;
+        return (val + 500) / 1000;
 }
 
 /*
diff --git a/drivers/hwmon/f75375s.c b/drivers/hwmon/f75375s.c
index eedf574ab539..f609b5727ba9 100644
--- a/drivers/hwmon/f75375s.c
+++ b/drivers/hwmon/f75375s.c
@@ -172,7 +172,7 @@ static inline void f75375_write8(struct i2c_client *client, u8 reg,
 static inline void f75375_write16(struct i2c_client *client, u8 reg,
                 u16 value)
 {
-        int err = i2c_smbus_write_byte_data(client, reg, (value << 8));
+        int err = i2c_smbus_write_byte_data(client, reg, (value >> 8));
         if (err)
                 return;
         i2c_smbus_write_byte_data(client, reg + 1, (value & 0xFF));
@@ -200,9 +200,6 @@ static struct f75375_data *f75375_update_device(struct device *dev)
                                 f75375_read16(client, F75375_REG_FAN_MIN(nr));
                         data->fan_target[nr] =
                                 f75375_read16(client, F75375_REG_FAN_EXP(nr));
-                        data->pwm[nr] = f75375_read8(client,
-                                F75375_REG_FAN_PWM_DUTY(nr));
-
                 }
                 for (nr = 0; nr < 4; nr++) {
                         data->in_max[nr] =
@@ -218,6 +215,8 @@ static struct f75375_data *f75375_update_device(struct device *dev)
         if (time_after(jiffies, data->last_updated + 2 * HZ)
                 || !data->valid) {
                 for (nr = 0; nr < 2; nr++) {
+                        data->pwm[nr] = f75375_read8(client,
+                                F75375_REG_FAN_PWM_DUTY(nr));
                         /* assign MSB, therefore shift it by 8 bits */
                         data->temp11[nr] =
                                 f75375_read8(client, F75375_REG_TEMP(nr)) << 8;
@@ -369,7 +368,7 @@ static int set_pwm_enable_direct(struct i2c_client *client, int nr, int val)
                         fanmode  |= (3 << FAN_CTRL_MODE(nr));
                         break;
                 case 2: /* AUTOMATIC*/
-                        fanmode  |= (2 << FAN_CTRL_MODE(nr));
+                        fanmode  |= (1 << FAN_CTRL_MODE(nr));
                         break;
                 case 3: /* fan speed */
                         break;
@@ -723,7 +722,7 @@ static void f75375_init(struct i2c_client *client, struct f75375_data *data,
                         if (data->kind == f75387) {
                                 bool manu, duty;
 
-                                if (!(conf & (1 << F75387_FAN_CTRL_LINEAR(nr))))
+                                if (!(mode & (1 << F75387_FAN_CTRL_LINEAR(nr))))
                                         data->pwm_mode[nr] = 1;
 
                                 manu = ((mode >> F75387_FAN_MANU_MODE(nr)) & 1);
diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
index 6ddeae049058..91fdd1fe18b0 100644
--- a/drivers/hwmon/sht15.c
+++ b/drivers/hwmon/sht15.c
@@ -883,7 +883,7 @@ static int sht15_invalidate_voltage(struct notifier_block *nb,
 
 static int __devinit sht15_probe(struct platform_device *pdev)
 {
-        int ret = 0;
+        int ret;
         struct sht15_data *data = kzalloc(sizeof(*data), GFP_KERNEL);
         u8 status = 0;
 
@@ -901,6 +901,7 @@ static int __devinit sht15_probe(struct platform_device *pdev)
         init_waitqueue_head(&data->wait_queue);
 
         if (pdev->dev.platform_data == NULL) {
+                ret = -EINVAL;
                 dev_err(&pdev->dev, "no platform data supplied\n");
                 goto err_free_data;
         }
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
index 0e0af0445222..5276d1933dbc 100644
--- a/drivers/hwmon/w83627ehf.c
+++ b/drivers/hwmon/w83627ehf.c
@@ -1319,6 +1319,7 @@ store_pwm_mode(struct device *dev, struct device_attribute *attr,
 {
         struct w83627ehf_data *data = dev_get_drvdata(dev);
         struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        struct w83627ehf_sio_data *sio_data = dev->platform_data;
         int nr = sensor_attr->index;
         unsigned long val;
         int err;
@@ -1330,6 +1331,11 @@ store_pwm_mode(struct device *dev, struct device_attribute *attr,
 
         if (val > 1)
                 return -EINVAL;
+
+        /* On NCT67766F, DC mode is only supported for pwm1 */
+        if (sio_data->kind == nct6776 && nr && val != 1)
+                return -EINVAL;
+
         mutex_lock(&data->update_lock);
         reg = w83627ehf_read_value(data, W83627EHF_REG_PWM_ENABLE[nr]);
         data->pwm_mode[nr] = val;
@@ -1914,9 +1920,26 @@ w83627ehf_check_fan_inputs(const struct w83627ehf_sio_data *sio_data,
                 fan4min = 0;
                 fan5pin = 0;
         } else if (sio_data->kind == nct6776) {
-                fan3pin = !(superio_inb(sio_data->sioreg, 0x24) & 0x40);
-                fan4pin = !!(superio_inb(sio_data->sioreg, 0x1C) & 0x01);
-                fan5pin = !!(superio_inb(sio_data->sioreg, 0x1C) & 0x02);
+                bool gpok = superio_inb(sio_data->sioreg, 0x27) & 0x80;
+
+                superio_select(sio_data->sioreg, W83627EHF_LD_HWM);
+                regval = superio_inb(sio_data->sioreg, SIO_REG_ENABLE);
+
+                if (regval & 0x80)
+                        fan3pin = gpok;
+                else
+                        fan3pin = !(superio_inb(sio_data->sioreg, 0x24) & 0x40);
+
+                if (regval & 0x40)
+                        fan4pin = gpok;
+                else
+                        fan4pin = !!(superio_inb(sio_data->sioreg, 0x1C) & 0x01);
+
+                if (regval & 0x20)
+                        fan5pin = gpok;
+                else
+                        fan5pin = !!(superio_inb(sio_data->sioreg, 0x1C) & 0x02);
+
                 fan4min = fan4pin;
         } else if (sio_data->kind == w83667hg || sio_data->kind == w83667hg_b) {
                 fan3pin = 1;
@@ -2331,11 +2354,6 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev)
         for (i = 0; i < data->pwm_num; i++)
                 data->pwm_enable_orig[i] = data->pwm_enable[i];
 
-        /* Read pwm data to save original values */
-        w83627ehf_update_pwm_common(dev, data);
-        for (i = 0; i < data->pwm_num; i++)
-                data->pwm_enable_orig[i] = data->pwm_enable[i];
-
         /* Register sysfs hooks */
         for (i = 0; i < ARRAY_SIZE(sda_sf3_arrays); i++) {
                 err = device_create_file(dev, &sda_sf3_arrays[i].dev_attr);