lkml.org 
[lkml]   [2013]   [Aug]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 110/133] hwmon: (adt7470) Fix incorrect return code check
    Date
    3.8.13.7 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Curt Brune <curt@cumulusnetworks.com>

    commit 93d783bcca69bfacc8dc739d8a050498402587b5 upstream.

    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>
    Signed-off-by: Guenter Roeck <linux@roeck-us.net>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    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 39ecb1a..aa63420 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.8.1.2


    \
     
     \ /
      Last update: 2013-08-17 06:01    [W:2.241 / U:0.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site