lkml.org 
[lkml]   [2013]   [Nov]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.4 29/39] hwmon: (lm90) Fix max6696 alarm handling
    Date
    3.4-stable review patch.  If anyone has any objections, please let me know.

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

    From: Guenter Roeck <linux@roeck-us.net>

    commit e41fae2b1ed8c78283d73651cd65be0228c0dd1c upstream.

    Bit 2 of status register 2 on MAX6696 (external diode 2 open)
    sets ALERT; the bit thus has to be listed in alert_alarms.
    Also display a message in the alert handler if the condition
    is encountered.

    Even though not all overtemperature conditions cause ALERT
    to be set, we should not ignore them in the alert handler.
    Display messages for all out-of-range conditions.

    Reported-by: Jean Delvare <khali@linux-fr.org>
    Signed-off-by: Guenter Roeck <linux@roeck-us.net>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/hwmon/lm90.c | 11 +++++++----
    1 file changed, 7 insertions(+), 4 deletions(-)

    --- a/drivers/hwmon/lm90.c
    +++ b/drivers/hwmon/lm90.c
    @@ -278,7 +278,7 @@ static const struct lm90_params lm90_par
    [max6696] = {
    .flags = LM90_HAVE_EMERGENCY
    | LM90_HAVE_EMERGENCY_ALARM | LM90_HAVE_TEMP3,
    - .alert_alarms = 0x187c,
    + .alert_alarms = 0x1c7c,
    .max_convrate = 6,
    .reg_local_ext = MAX6657_REG_R_LOCAL_TEMPL,
    },
    @@ -1504,19 +1504,22 @@ static void lm90_alert(struct i2c_client
    if ((alarms & 0x7f) == 0 && (alarms2 & 0xfe) == 0) {
    dev_info(&client->dev, "Everything OK\n");
    } else {
    - if (alarms & 0x61)
    + if ((alarms & 0x61) || (alarms2 & 0x80))
    dev_warn(&client->dev,
    "temp%d out of range, please check!\n", 1);
    - if (alarms & 0x1a)
    + if ((alarms & 0x1a) || (alarms2 & 0x20))
    dev_warn(&client->dev,
    "temp%d out of range, please check!\n", 2);
    if (alarms & 0x04)
    dev_warn(&client->dev,
    "temp%d diode open, please check!\n", 2);

    - if (alarms2 & 0x18)
    + if (alarms2 & 0x5a)
    dev_warn(&client->dev,
    "temp%d out of range, please check!\n", 3);
    + if (alarms2 & 0x04)
    + dev_warn(&client->dev,
    + "temp%d diode open, please check!\n", 3);

    /*
    * Disable ALERT# output, because these chips don't implement



    \
     
     \ /
      Last update: 2013-11-27 03:41    [W:2.585 / U:0.840 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site