From 457cd77da391b72ca5415a1e0165b03cbb6c0404 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 6 Feb 2008 01:38:49 -0800 Subject: [PATCH] --- yaml --- r: 83535 b: refs/heads/master c: 68db30472df36671cc397654c42802c93ef19f19 h: refs/heads/master i: 83533: cbb4279d680a8645c10bdd979f576f7b7be96921 83531: a23ad152c9696fcc3d711ac96a4faf9d92b682ad 83527: 53053bf761b4d3a990b6321a21a9c3d891819cb7 83519: ecb780621fedd127e36ebe592f8e8a7b080821f1 v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-bfin.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4b253229370a..a082b4a6882d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5438de442230c52d503d17943926520ee9a2eeee +refs/heads/master: 68db30472df36671cc397654c42802c93ef19f19 diff --git a/trunk/drivers/rtc/rtc-bfin.c b/trunk/drivers/rtc/rtc-bfin.c index b14a9c46f3b2..a4ed2f82a09b 100644 --- a/trunk/drivers/rtc/rtc-bfin.c +++ b/trunk/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; }