The patch titled
Blackfin RTC driver: read_alarm() checks the enabled field, not the
pending field.
has been removed from the -mm tree. Its filename was
blackfin-rtc-driver-read_alarm-checks-the-enabled-field-not-the-pending-field.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: Blackfin RTC driver: read_alarm() checks the enabled field, not the
pending field.
From: Mike Frysinger <[EMAIL PROTECTED]>
also, dont bother using memcpy since we can just do an assignment of the same
structure.
Signed-off-by: Mike Frysinger <[EMAIL PROTECTED]>
Signed-off-by: Bryan Wu <[EMAIL PROTECTED]>
Acked-by: Alessandro Zummo <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
drivers/rtc/rtc-bfin.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN
drivers/rtc/rtc-bfin.c~blackfin-rtc-driver-read_alarm-checks-the-enabled-field-not-the-pending-field
drivers/rtc/rtc-bfin.c
---
a/drivers/rtc/rtc-bfin.c~blackfin-rtc-driver-read_alarm-checks-the-enabled-field-not-the-pending-field
+++ a/drivers/rtc/rtc-bfin.c
@@ -326,7 +326,7 @@ static int bfin_rtc_read_alarm(struct de
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 dev
{
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;
}
_
Patches currently in -mm which might be from [EMAIL PROTECTED] are
origin.patch
git-watchdog.patch
add-cmpxchg_local-to-blackfin-replace-__cmpxchg-by-generic-cmpxchg.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
