Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[cascardo/linux.git] / drivers / rtc / rtc-pcf8563.c

diff --git a/drivers/rtc/rtc-pcf8563.c b/drivers/rtc/rtc-pcf8563.c
index 5a197d9..c2ef0a2 100644 (file)
--- a/drivers/rtc/rtc-pcf8563.c
+++ b/drivers/rtc/rtc-pcf8563.c
@@ -167,8 +167,8 @@ static irqreturn_t pcf8563_irq(int irq, void *dev_id)
        char pending;
 
        err = pcf8563_get_alarm_mode(pcf8563->client, NULL, &pending);
-       if (err < 0)
-               return err;
+       if (err)
+               return IRQ_NONE;
 
        if (pending) {
                rtc_update_irq(pcf8563->rtc, 1, RTC_IRQF | RTC_AF);