lkml.org 
[lkml]   [2011]   [Feb]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 08/23] hwmon: (adm1026) Fix setting fan_div
    2.6.27.58-stable review patch.  If anyone has any objections, please let us know.

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

    From: Gabriele Gorla <gorlik@penguintown.net>

    commit 52bc9802ce849d0d287cc5fe76d06b0daa3986ca upstream.

    Prevent setting fan_div from stomping on other fans that share the
    same I2C register.

    Signed-off-by: Gabriele Gorla <gorlik@penguintown.net>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Signed-off-by: Willy Tarreau <w@1wt.eu>

    ---
    drivers/hwmon/adm1026.c | 16 +++++++++-------
    1 file changed, 9 insertions(+), 7 deletions(-)

    Index: longterm-2.6.27/drivers/hwmon/adm1026.c
    ===================================================================
    --- longterm-2.6.27.orig/drivers/hwmon/adm1026.c 2011-01-29 11:27:12.646064622 +0100
    +++ longterm-2.6.27/drivers/hwmon/adm1026.c 2011-01-29 11:27:13.410065115 +0100
    @@ -922,7 +922,7 @@
    int nr = sensor_attr->index;
    struct i2c_client *client = to_i2c_client(dev);
    struct adm1026_data *data = i2c_get_clientdata(client);
    - int val, orig_div, new_div, shift;
    + int val, orig_div, new_div;

    val = simple_strtol(buf, NULL, 10);
    new_div = DIV_TO_REG(val);
    @@ -932,15 +932,17 @@
    data->fan_div[nr] = DIV_FROM_REG(new_div);

    if (nr < 4) { /* 0 <= nr < 4 */
    - shift = 2 * nr;
    adm1026_write_value(client, ADM1026_REG_FAN_DIV_0_3,
    - ((DIV_TO_REG(orig_div) & (~(0x03 << shift))) |
    - (new_div << shift)));
    + (DIV_TO_REG(data->fan_div[0]) << 0) |
    + (DIV_TO_REG(data->fan_div[1]) << 2) |
    + (DIV_TO_REG(data->fan_div[2]) << 4) |
    + (DIV_TO_REG(data->fan_div[3]) << 6));
    } else { /* 3 < nr < 8 */
    - shift = 2 * (nr - 4);
    adm1026_write_value(client, ADM1026_REG_FAN_DIV_4_7,
    - ((DIV_TO_REG(orig_div) & (~(0x03 << (2 * shift)))) |
    - (new_div << shift)));
    + (DIV_TO_REG(data->fan_div[4]) << 0) |
    + (DIV_TO_REG(data->fan_div[5]) << 2) |
    + (DIV_TO_REG(data->fan_div[6]) << 4) |
    + (DIV_TO_REG(data->fan_div[7]) << 6));
    }

    if (data->fan_div[nr] != orig_div) {



    \
     
     \ /
      Last update: 2011-02-07 00:51    [W:0.061 / U:30.028 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site