Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d103e90 authored by David Brownell's avatar David Brownell Committed by Linus Torvalds
Browse files

[PATCH] rtc-sh: correctly report rtc_wkalrm.enabled 



This fixes the SH rtc driver to
  (a) correctly report 'enabled' status with other alarm status;
  (b) not duplicate that status in its procfs dump

Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Acked-by: default avatarPaul Mundt <lethal@linux-sh.org>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6fa1da8e

drivers/rtc/rtc-sh.c

+2 −2
Original line number Diff line number Diff line
@@ -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;