[170/251] hwmon: (adt7470) Fix incorrect return code check
3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
--
From: Curt Brune
[ Upstream commit 93d783bcca69bfacc8dc739d8a050498402587b5 ]
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
Cc: sta...@vger.kernel.org
Signed-off-by: Guenter Roeck
Signed-off-by: Steven Rostedt
---
drivers/hwmon/adt7470.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/hwmon/adt7470.c b/drivers/hwmon/adt7470.c
index 54ec8905..034085d 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)
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[170/251] hwmon: (adt7470) Fix incorrect return code check
3.6.11.9-rc1 stable review patch.
If anyone has any objections, please let me know.
--
From: Curt Brune c...@cumulusnetworks.com
[ Upstream commit 93d783bcca69bfacc8dc739d8a050498402587b5 ]
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 c...@cumulusnetworks.com
Cc: sta...@vger.kernel.org
Signed-off-by: Guenter Roeck li...@roeck-us.net
Signed-off-by: Steven Rostedt rost...@goodmis.org
---
drivers/hwmon/adt7470.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/hwmon/adt7470.c b/drivers/hwmon/adt7470.c
index 54ec8905..034085d 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)
--
1.7.10.4
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
