From 68db30472df36671cc397654c42802c93ef19f19 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 6 Feb 2008 01:38:49 -0800 Subject: Blackfin RTC driver: read_alarm() checks the enabled field, not the pending field. also, dont bother using memcpy since we can just do an assignment of the same structure. Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Acked-by: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/rtc/rtc-bfin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/rtc/rtc-bfin.c') diff --git a/drivers/rtc/rtc-bfin.c b/drivers/rtc/rtc-bfin.c index b14a9c46f3b..a4ed2f82a09 100644 --- a/drivers/rtc/rtc-bfin.c +++ b/drivers/rtc/rtc-bfin.c @@ -326,7 +326,7 @@ static int bfin_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) struct bfin_rtc *rtc = dev_get_drvdata(dev); dev_dbg_stamp(dev); memcpy(&alrm->time, &rtc->rtc_alarm, sizeof(struct rtc_time)); - alrm->pending = !!(bfin_read_RTC_ICTL() & (RTC_ISTAT_ALARM | RTC_ISTAT_ALARM_DAY)); + alrm->enabled = !!(bfin_read_RTC_ICTL() & (RTC_ISTAT_ALARM | RTC_ISTAT_ALARM_DAY)); return 0; } @@ -334,7 +334,7 @@ static int bfin_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) { struct bfin_rtc *rtc = dev_get_drvdata(dev); dev_dbg_stamp(dev); - memcpy(&rtc->rtc_alarm, &alrm->time, sizeof(struct rtc_time)); + rtc->rtc_alarm = alrm->time; return 0; } -- cgit v1.2.3