diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-27 10:46:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-27 10:46:47 -0800 |
| commit | 101e5c7470eb7f77ae87f966b9155f0dbb5b4698 (patch) | |
| tree | 151e031713daa8cfe0d06586d30c5c3699d45dd0 /drivers/hwmon/emc6w201.c | |
| parent | ddf75ae34e61bc8472f8b54281ad29bc87274be1 (diff) | |
| parent | 86266ca0e23b2b8e7e38edda1675cd085a9abc14 (diff) | |
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
Diffstat (limited to 'drivers/hwmon/emc6w201.c')
| -rw-r--r-- | drivers/hwmon/emc6w201.c | 2 |
1 files changed, 1 insertions, 1 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) |