diff options
| author | Mike Frysinger <michael.frysinger@analog.com> | 2008-02-06 01:38:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-06 10:41:14 -0800 |
| commit | 68db30472df36671cc397654c42802c93ef19f19 (patch) | |
| tree | acf4dee10353139203484ed18906dbc6287f8382 /drivers/rtc | |
| parent | 5438de442230c52d503d17943926520ee9a2eeee (diff) | |
| download | linux-68db30472df36671cc397654c42802c93ef19f19.tar.gz linux-68db30472df36671cc397654c42802c93ef19f19.tar.bz2 linux-68db30472df36671cc397654c42802c93ef19f19.zip | |
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 <michael.frysinger@analog.com>
Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Acked-by: Alessandro Zummo <alessandro.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/rtc-bfin.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-bfin.c b/drivers/rtc/rtc-bfin.c index b14a9c46f3b2..a4ed2f82a09b 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; } |