Unverified Commit 5f34e37c authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14744 rtc: check if __rtc_read_time was successful in rtc_timer_do_work() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zeng Heng <zengheng4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/FUFHRAWD7XXBFBLPAWIHVT5SGJVA6YPD/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBEGFG 
 
Link:https://gitee.com/openeuler/kernel/pulls/14744

 

Reviewed-by: default avatarXiongfeng Wang <wangxiongfeng2@huawei.com>
Reviewed-by: default avatarYuan Can <yuancan@huawei.com>
Reviewed-by: default avatarWang ShaoBo <bobo.shaobowang@huawei.com>
Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
parents 43c2a19e c0fb911f

drivers/rtc/interface.c

+6 −1
Original line number Diff line number Diff line
@@ -914,13 +914,18 @@ void rtc_timer_do_work(struct work_struct *work) 
	struct timerqueue_node *next;

	ktime_t now;

	struct rtc_time tm;

	int err;



	struct rtc_device *rtc =

		container_of(work, struct rtc_device, irqwork);



	mutex_lock(&rtc->ops_lock);

again:

	__rtc_read_time(rtc, &tm);

	err = __rtc_read_time(rtc, &tm);

	if (err) {

		mutex_unlock(&rtc->ops_lock);

		return;

	}

	now = rtc_tm_to_ktime(tm);

	while ((next = timerqueue_getnext(&rtc->timerqueue))) {

		if (next->expires > now)