From 679cb6de0fc4c55170ae2b5ca7fd720023b9c7fb Mon Sep 17 00:00:00 2001 From: David Brownell Date: Wed, 10 Jan 2007 23:15:32 -0800 Subject: [PATCH] --- yaml --- r: 45473 b: refs/heads/master c: 0d103e90f63c4b78f2101f8c0bd303fa049ce9a7 h: refs/heads/master i: 45471: 0635de80987172d5e12b832e789810effd3df571 v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-sh.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 235e7e4ee295..893fd6f61512 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6fa1da8ea9318af6a0252f56cd2e689616346218 +refs/heads/master: 0d103e90f63c4b78f2101f8c0bd303fa049ce9a7 diff --git a/trunk/drivers/rtc/rtc-sh.c b/trunk/drivers/rtc/rtc-sh.c index 72ba1a70f35f..e9e0934380b8 100644 --- a/trunk/drivers/rtc/rtc-sh.c +++ b/trunk/drivers/rtc/rtc-sh.c @@ -264,8 +264,6 @@ static int sh_rtc_proc(struct device *dev, struct seq_file *seq) unsigned int tmp; tmp = readb(rtc->regbase + RCR1); - seq_printf(seq, "alarm_IRQ\t: %s\n", - (tmp & RCR1_AIE) ? "yes" : "no"); seq_printf(seq, "carry_IRQ\t: %s\n", (tmp & RCR1_CIE) ? "yes" : "no"); @@ -428,6 +426,8 @@ static int sh_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *wkalrm) tm->tm_mon -= 1; /* RTC is 1-12, tm_mon is 0-11 */ tm->tm_year = 0xffff; + wkalrm->enabled = (readb(rtc->regbase + RCR1) & RCR1_AIE) ? 1 : 0; + spin_unlock_irq(&rtc->lock); return 0;