2 files changed, 6 insertions, 6 deletions

diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c
index 6d4012dd6922..bac1eeb3d312 100644
--- a/drivers/rtc/interface.c
+++ b/drivers/rtc/interface.c
@@ -265,8 +265,10 @@ int __rtc_read_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm)
                         return err;
 
                 /* full-function RTCs won't have such missing fields */
-                if (rtc_valid_tm(&alarm->time) == 0)
+                if (rtc_valid_tm(&alarm->time) == 0) {
+                        rtc_add_offset(rtc, &alarm->time);
                         return 0;
+                }
 
                 /* get the "after" timestamp, to detect wrapped fields */
                 err = rtc_read_time(rtc, &now);
@@ -409,7 +411,6 @@ static int __rtc_set_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm)
         if (err)
                 return err;
 
-        rtc_subtract_offset(rtc, &alarm->time);
         scheduled = rtc_tm_to_time64(&alarm->time);
 
         /* Make sure we're not setting alarms in the past */
@@ -426,6 +427,8 @@ static int __rtc_set_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm)
          * over right here, before we set the alarm.
          */
 
+        rtc_subtract_offset(rtc, &alarm->time);
+
         if (!rtc->ops)
                 err = -ENODEV;
         else if (!rtc->ops->set_alarm)
@@ -467,7 +470,6 @@ int rtc_set_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm)
 
         mutex_unlock(&rtc->ops_lock);
 
-        rtc_add_offset(rtc, &alarm->time);
         return err;
 }
 EXPORT_SYMBOL_GPL(rtc_set_alarm);
diff --git a/drivers/rtc/rtc-mrst.c b/drivers/rtc/rtc-mrst.c
index 097a4d4e2aba..1925aaf09093 100644
--- a/drivers/rtc/rtc-mrst.c
+++ b/drivers/rtc/rtc-mrst.c
@@ -367,10 +367,8 @@ static int vrtc_mrst_do_probe(struct device *dev, struct resource *iomem,
         }
 
         retval = rtc_register_device(mrst_rtc.rtc);
-        if (retval) {
-                retval = PTR_ERR(mrst_rtc.rtc);
+        if (retval)
                 goto cleanup0;
-        }
 
         dev_dbg(dev, "initialised\n");
         return 0;