diff options
| author | Curt Brune <curt@cumulusnetworks.com> | 2013-08-08 21:11:03 +0200 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2013-08-08 21:43:07 +0200 |
| commit | 93d783bcca69bfacc8dc739d8a050498402587b5 (patch) | |
| tree | 97c42976e05ecb05f94738cd8a8ae4ff2d25cf7b /drivers | |
| parent | Linux 3.11-rc4 (diff) | |
| download | linux-93d783bcca69bfacc8dc739d8a050498402587b5.tar.xz linux-93d783bcca69bfacc8dc739d8a050498402587b5.zip | |
hwmon: (adt7470) Fix incorrect return code check
In adt7470_write_word_data(), which writes two bytes using
i2c_smbus_write_byte_data(), the return codes are incorrectly AND-ed
together when they should be OR-ed together.
The return code of i2c_smbus_write_byte_data() is zero for success.
The upshot is only the first byte was ever written to the hardware.
The 2nd byte was never written out.
I noticed that trying to set the fan speed limits was not working
correctly on my system. Setting the fan speed limits is the only
code that uses adt7470_write_word_data(). After making the change
the limit settings work and the alarms work also.
Signed-off-by: Curt Brune <curt@cumulusnetworks.com>
Cc: stable@vger.kernel.org
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers')
| -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, u16 value) { return i2c_smbus_write_byte_data(client, reg, value & 0xFF) - && i2c_smbus_write_byte_data(client, reg + 1, value >> 8); + || i2c_smbus_write_byte_data(client, reg + 1, value >> 8); } static void adt7470_init_client(struct i2c_client *client) |