Merge git://www.linux-watchdog.org/linux-watchdog

[deliverable/linux.git] / drivers / hwmon / lm90.c

diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
index f51e758ba5298c1d05f5c5301ea57dc95204b85c..1e8237478b2f1467f18aec07c3596f14e8351e0d 100644 (file)
--- a/drivers/hwmon/lm90.c
+++ b/drivers/hwmon/lm90.c
@@ -1719,10 +1719,14 @@ static int lm90_probe(struct i2c_client *client,
        return 0;
 }
 
-static void lm90_alert(struct i2c_client *client, unsigned int flag)
+static void lm90_alert(struct i2c_client *client, enum i2c_alert_protocol type,
+                      unsigned int flag)
 {
        u16 alarms;
 
+       if (type != I2C_PROTOCOL_SMBUS_ALERT)
+               return;
+
        if (lm90_is_tripped(client, &alarms)) {
                /*
                 * Disable ALERT# output, because these chips don't implement