1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
index cdff74282955..14e36c114d61 100644
--- a/drivers/hwmon/lm90.c
+++ b/drivers/hwmon/lm90.c
@@ -278,7 +278,7 @@ static const struct lm90_params lm90_params[] = {
         [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,
         },
@@ -1500,19 +1500,22 @@ static void lm90_alert(struct i2c_client *client, unsigned int flag)
         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