Commit dd061d1a authored by Changhwan Youn's avatar Changhwan Youn Committed by Linus Torvalds

rtc: rtc-s3c: fix setting missing field of getalarm

Current s3c_rtc_getalarm() sets missing field of alarm time with 0xff.
But this value should be -1 according to drivers/rtc/interface.c.
Signed-off-by: default avatarChanghwan Youn <chaos.youn@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
Acked-by: default avatarBen Dooks <ben-linux@fluff.org>
Cc: Wan ZongShun <mcuos.com@gmail.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f61ae671
...@@ -242,34 +242,34 @@ static int s3c_rtc_getalarm(struct device *dev, struct rtc_wkalrm *alrm) ...@@ -242,34 +242,34 @@ static int s3c_rtc_getalarm(struct device *dev, struct rtc_wkalrm *alrm)
if (alm_en & S3C2410_RTCALM_SECEN) if (alm_en & S3C2410_RTCALM_SECEN)
alm_tm->tm_sec = bcd2bin(alm_tm->tm_sec); alm_tm->tm_sec = bcd2bin(alm_tm->tm_sec);
else else
alm_tm->tm_sec = 0xff; alm_tm->tm_sec = -1;
if (alm_en & S3C2410_RTCALM_MINEN) if (alm_en & S3C2410_RTCALM_MINEN)
alm_tm->tm_min = bcd2bin(alm_tm->tm_min); alm_tm->tm_min = bcd2bin(alm_tm->tm_min);
else else
alm_tm->tm_min = 0xff; alm_tm->tm_min = -1;
if (alm_en & S3C2410_RTCALM_HOUREN) if (alm_en & S3C2410_RTCALM_HOUREN)
alm_tm->tm_hour = bcd2bin(alm_tm->tm_hour); alm_tm->tm_hour = bcd2bin(alm_tm->tm_hour);
else else
alm_tm->tm_hour = 0xff; alm_tm->tm_hour = -1;
if (alm_en & S3C2410_RTCALM_DAYEN) if (alm_en & S3C2410_RTCALM_DAYEN)
alm_tm->tm_mday = bcd2bin(alm_tm->tm_mday); alm_tm->tm_mday = bcd2bin(alm_tm->tm_mday);
else else
alm_tm->tm_mday = 0xff; alm_tm->tm_mday = -1;
if (alm_en & S3C2410_RTCALM_MONEN) { if (alm_en & S3C2410_RTCALM_MONEN) {
alm_tm->tm_mon = bcd2bin(alm_tm->tm_mon); alm_tm->tm_mon = bcd2bin(alm_tm->tm_mon);
alm_tm->tm_mon -= 1; alm_tm->tm_mon -= 1;
} else { } else {
alm_tm->tm_mon = 0xff; alm_tm->tm_mon = -1;
} }
if (alm_en & S3C2410_RTCALM_YEAREN) if (alm_en & S3C2410_RTCALM_YEAREN)
alm_tm->tm_year = bcd2bin(alm_tm->tm_year); alm_tm->tm_year = bcd2bin(alm_tm->tm_year);
else else
alm_tm->tm_year = 0xffff; alm_tm->tm_year = -1;
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment