Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

[linux-block.git] / drivers / rtc / rtc-m41t80.c

diff --git a/drivers/rtc/rtc-m41t80.c b/drivers/rtc/rtc-m41t80.c
index 494052dbd39ff3b8c657b500693e35868aa55ec6..c1963f7c424d7032bb13fccc9cf158c7f7e6f2d0 100644 (file)
--- a/drivers/rtc/rtc-m41t80.c
+++ b/drivers/rtc/rtc-m41t80.c
@@ -914,9 +914,14 @@ static int m41t80_probe(struct i2c_client *client)
                                              "wakeup-source");
 #endif
        if (client->irq > 0) {
+               unsigned long irqflags = IRQF_TRIGGER_LOW;
+
+               if (dev_fwnode(&client->dev))
+                       irqflags = 0;
+
                rc = devm_request_threaded_irq(&client->dev, client->irq,
                                               NULL, m41t80_handle_irq,
-                                              IRQF_TRIGGER_LOW | IRQF_ONESHOT,
+                                              irqflags | IRQF_ONESHOT,
                                               "m41t80", client);
                if (rc) {
                        dev_warn(&client->dev, "unable to request IRQ, alarms disabled\n");