Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull hwmon fixes from Guenter Roeck:

 - Report i2c errors to userspace in lm73 driver

 - Fix problem with DIV_ROUND_CLOSEST and unsigned divisors in emc6w201
   driver

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (emc6w201) Fix DIV_ROUND_CLOSEST problem with unsigned divisors
  hwmon: (lm73} Detect and report i2c bus errors

2 files changed, 12 insertions, 6 deletions

diff --git a/drivers/hwmon/emc6w201.c b/drivers/hwmon/emc6w201.c
index a98c917b5888..789bd4fb329b 100644
--- a/drivers/hwmon/emc6w201.c
+++ b/drivers/hwmon/emc6w201.c
@@ -187,7 +187,7 @@ static struct emc6w201_data *emc6w201_update_device(struct device *dev)
  * Sysfs callback functions
  */
 
-static const u16 nominal_mv[6] = { 2500, 1500, 3300, 5000, 1500, 1500 };
+static const s16 nominal_mv[6] = { 2500, 1500, 3300, 5000, 1500, 1500 };
 
 static ssize_t show_in(struct device *dev, struct device_attribute *devattr,
         char *buf)
diff --git a/drivers/hwmon/lm73.c b/drivers/hwmon/lm73.c
index 8fa2632cbbaf..7272176a9ec7 100644
--- a/drivers/hwmon/lm73.c
+++ b/drivers/hwmon/lm73.c
@@ -49,6 +49,7 @@ static ssize_t set_temp(struct device *dev, struct device_attribute *da,
         struct i2c_client *client = to_i2c_client(dev);
         long temp;
         short value;
+        s32 err;
 
         int status = kstrtol(buf, 10, &temp);
         if (status < 0)
@@ -57,8 +58,8 @@ static ssize_t set_temp(struct device *dev, struct device_attribute *da,
         /* Write value */
         value = (short) SENSORS_LIMIT(temp/250, (LM73_TEMP_MIN*4),
                 (LM73_TEMP_MAX*4)) << 5;
-        i2c_smbus_write_word_swapped(client, attr->index, value);
-        return count;
+        err = i2c_smbus_write_word_swapped(client, attr->index, value);
+        return (err < 0) ? err : count;
 }
 
 static ssize_t show_temp(struct device *dev, struct device_attribute *da,
@@ -66,11 +67,16 @@ static ssize_t show_temp(struct device *dev, struct device_attribute *da,
 {
         struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
         struct i2c_client *client = to_i2c_client(dev);
+        int temp;
+
+        s32 err = i2c_smbus_read_word_swapped(client, attr->index);
+        if (err < 0)
+                return err;
+
         /* use integer division instead of equivalent right shift to
            guarantee arithmetic shift and preserve the sign */
-        int temp = ((s16) (i2c_smbus_read_word_swapped(client,
-                    attr->index))*250) / 32;
-        return sprintf(buf, "%d\n", temp);
+        temp = (((s16) err) * 250) / 32;
+        return scnprintf(buf, PAGE_SIZE, "%d\n", temp);
 }