Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[deliverable/linux.git] / drivers / rtc / interface.c

diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c
index 5813fa52c3d43328c80bdb799d38d0b1c68d129d..5b2717f5dafa73e808f9bbf29387e223109588b2 100644 (file)
--- a/drivers/rtc/interface.c
+++ b/drivers/rtc/interface.c
@@ -348,6 +348,8 @@ static int __rtc_set_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm)
 
        /* Make sure we're not setting alarms in the past */
        err = __rtc_read_time(rtc, &tm);
+       if (err)
+               return err;
        rtc_tm_to_time(&tm, &now);
        if (scheduled <= now)
                return -ETIME;