Messages in this thread Patch in this message | | | From | Xunlei Pang <> | Subject | [PATCH v2 3/4] drivers/rtc/isl1208: Replace deprecated rtc_tm_to_time() | Date | Tue, 2 Jun 2015 17:04:21 +0800 |
| |
From: Xunlei Pang <pang.xunlei@linaro.org>
isl1208_i2c_set_alarm() uses deprecated rtc_tm_to_time(), which will overflow in year 2106 on 32-bit machines.
This patch solves this by: - Replacing rtc_tm_to_time() with rtc_tm_subtract()
Cc: Herbert Valerio Riedel <hvr@gnu.org> Signed-off-by: Xunlei Pang <pang.xunlei@linaro.org> --- drivers/rtc/rtc-isl1208.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/drivers/rtc/rtc-isl1208.c b/drivers/rtc/rtc-isl1208.c index c3c549d..6eb5d36 100644 --- a/drivers/rtc/rtc-isl1208.c +++ b/drivers/rtc/rtc-isl1208.c @@ -370,22 +370,15 @@ isl1208_i2c_set_alarm(struct i2c_client *client, struct rtc_wkalrm *alarm) struct rtc_time *alarm_tm = &alarm->time; u8 regs[ISL1208_ALARM_SECTION_LEN] = { 0, }; const int offs = ISL1208_REG_SCA; - unsigned long rtc_secs, alarm_secs; struct rtc_time rtc_tm; int err, enable; err = isl1208_i2c_read_time(client, &rtc_tm); if (err) return err; - err = rtc_tm_to_time(&rtc_tm, &rtc_secs); - if (err) - return err; - err = rtc_tm_to_time(alarm_tm, &alarm_secs); - if (err) - return err; /* If the alarm time is before the current time disable the alarm */ - if (!alarm->enabled || alarm_secs <= rtc_secs) + if (!alarm->enabled || rtc_tm_subtract(alarm_tm, &rtc_tm) <= 0) enable = 0x00; else enable = 0x80; -- 1.9.1
| |