Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37b5dca2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'rtc-4.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux 

Pull RTC fixes from Alexandre Belloni:
 "Two fixes for 4.18:

   - an important core fix for RTCs using the core offsetting only one
     driver is affected

   - a fix for the error path of mrst"

* tag 'rtc-4.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  rtc: fix alarm read and set offset
  rtc: mrst: fix error code in probe()
parents c31496db fd6792bb

drivers/rtc/interface.c

+5 −3
Original line number Diff line number Diff line
@@ -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);

drivers/rtc/rtc-mrst.c

+1 −3
Original line number Diff line number Diff line
@@ -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;