]> git.ipfire.org Git - people/ms/linux.git/commitdiff
hwmon: (lm90) Re-enable interrupts after alert clears
authorGuenter Roeck <linux@roeck-us.net>
Sat, 8 Jan 2022 19:37:19 +0000 (11:37 -0800)
committerGuenter Roeck <linux@roeck-us.net>
Mon, 24 Jan 2022 02:21:27 +0000 (18:21 -0800)
If alert handling is broken, interrupts are disabled after an alert and
re-enabled after the alert clears. However, if there is an interrupt
handler, this does not apply if alerts were originally disabled and enabled
when the driver was loaded. In that case, interrupts will stay disabled
after an alert was handled though the alert handler even after the alert
condition clears. Address the situation by always re-enabling interrupts
after the alert condition clears if there is an interrupt handler.

Fixes: 2abdc357c55d9 ("hwmon: (lm90) Unmask hardware interrupt")
Cc: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
drivers/hwmon/lm90.c

index cc5e48fe304b1ebdf52a839f52396edf1d385fce..e4ecf3440d7cff97c89ee5e8e9818b6c80d88fcf 100644 (file)
@@ -848,7 +848,7 @@ static int lm90_update_device(struct device *dev)
                 * Re-enable ALERT# output if it was originally enabled and
                 * relevant alarms are all clear
                 */
-               if (!(data->config_orig & 0x80) &&
+               if ((client->irq || !(data->config_orig & 0x80)) &&
                    !(data->alarms & data->alert_alarms)) {
                        if (data->config & 0x80) {
                                dev_dbg(&client->dev, "Re-enabling ALERT#\n");