diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-09 18:06:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-09 18:06:17 -0400 |
| commit | fdafa7cf97a3c4c1d731600b94241cb9cea40fc8 (patch) | |
| tree | 207821e0cefb52e5d2c4ace60a79719f8af85886 | |
| parent | 79a6fb1acec93ef829a59d88429aafddf42793d3 (diff) | |
| parent | 93d783bcca69bfacc8dc739d8a050498402587b5 (diff) | |
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fix from Guenter Roeck:
"Fix bug in adt7470 driver which causes it to fail writing fan speed
limits"
* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (adt7470) Fix incorrect return code check
| -rw-r--r-- | drivers/hwmon/adt7470.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/adt7470.c b/drivers/hwmon/adt7470.c index 0f34bca9f5e5..6099f50b28aa 100644 --- a/drivers/hwmon/adt7470.c +++ b/drivers/hwmon/adt7470.c | |||
| @@ -215,7 +215,7 @@ static inline int adt7470_write_word_data(struct i2c_client *client, u8 reg, | |||
| 215 | u16 value) | 215 | u16 value) |
| 216 | { | 216 | { |
| 217 | return i2c_smbus_write_byte_data(client, reg, value & 0xFF) | 217 | return i2c_smbus_write_byte_data(client, reg, value & 0xFF) |
| 218 | && i2c_smbus_write_byte_data(client, reg + 1, value >> 8); | 218 | || i2c_smbus_write_byte_data(client, reg + 1, value >> 8); |
| 219 | } | 219 | } |
| 220 | 220 | ||
| 221 | static void adt7470_init_client(struct i2c_client *client) | 221 | static void adt7470_init_client(struct i2c_client *client) |