Merge branches 'for-3.15/upstream-fixes' and 'for-3.16/upstream' into for-linus

[firefly-linux-kernel-4.4.55.git] / drivers / power / max17042_battery.c

diff --git a/drivers/power/max17042_battery.c b/drivers/power/max17042_battery.c
index e0b22f9b6fdd643edd124d3940025636924d0dc3..66da691c41cf5808c55d4714e4e7de6e409860d8 100644 (file)
--- a/drivers/power/max17042_battery.c
+++ b/drivers/power/max17042_battery.c
@@ -741,9 +741,9 @@ static int max17042_probe(struct i2c_client *client,
 
        if (client->irq) {
                ret = request_threaded_irq(client->irq, NULL,
-                                               max17042_thread_handler,
-                                               IRQF_TRIGGER_FALLING,
-                                               chip->battery.name, chip);
+                                       max17042_thread_handler,
+                                       IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
+                                       chip->battery.name, chip);
                if (!ret) {
                        regmap_read(chip->regmap, MAX17042_CONFIG, &val);
                        val |= CONFIG_ALRT_BIT_ENBL;