diff --git a/[refs] b/[refs] index a082b4a6882d..1fba675e4bc1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 68db30472df36671cc397654c42802c93ef19f19 +refs/heads/master: 48c1a56b4bf936590ddbee93bf7accf703ec0411 diff --git a/trunk/drivers/rtc/rtc-bfin.c b/trunk/drivers/rtc/rtc-bfin.c index a4ed2f82a09b..69810a2fc43b 100644 --- a/trunk/drivers/rtc/rtc-bfin.c +++ b/trunk/drivers/rtc/rtc-bfin.c @@ -325,7 +325,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->time = rtc->rtc_alarm; alrm->enabled = !!(bfin_read_RTC_ICTL() & (RTC_ISTAT_ALARM | RTC_ISTAT_ALARM_DAY)); return 0; }