hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rtc: test before subtraction on unsigned 

new_alarm is unsigned so test before the subtraction.

[akpm@linux-foundation.org: time-wrapping fix]
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Cc: David Brownell <david-b@pacbell.net>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Roel Kluin 2009-03-31 15:25:00 -07:00 committed by Linus Torvalds
parent c08cf9daf6
commit fa7af8b1bb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/rtc/rtc-ds1374.c
View File

@ -222,16 +222,16 @@ static int ds1374_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
rtc_tm_to_time(&alarm->time, &new_alarm); rtc_tm_to_time(&alarm->time, &new_alarm);
rtc_tm_to_time(&now, &itime); rtc_tm_to_time(&now, &itime);
new_alarm -= itime;
/* This can happen due to races, in addition to dates that are /* This can happen due to races, in addition to dates that are
* truly in the past. To avoid requiring the caller to check for * truly in the past. To avoid requiring the caller to check for
* races, dates in the past are assumed to be in the recent past * races, dates in the past are assumed to be in the recent past
* (i.e. not something that we'd rather the caller know about via * (i.e. not something that we'd rather the caller know about via
* an error), and the alarm is set to go off as soon as possible. * an error), and the alarm is set to go off as soon as possible.
*/ */
if (new_alarm <= 0) if (time_before_eq(new_alarm, itime))
new_alarm = 1; new_alarm = 1;
else
new_alarm -= itime;
mutex_lock(&ds1374->mutex); mutex_lock(&ds1374->mutex);