Commit 12b3e038 authored Aug 03, 2011 by Daniel Glöckner Committed by Linus Torvalds Aug 03, 2011

rtc-omap: fix initialization of control register



As the comment explains, the intention of the code is to clear the
OMAP_RTC_CTRL_MODE_12_24 bit, but instead it only clears the
OMAP_RTC_CTRL_SPLIT and OMAP_RTC_CTRL_AUTO_COMP bits, which should be
kept.  OMAP_RTC_CTRL_DISABLE, OMAP_RTC_CTRL_SET_32_COUNTER,
OMAP_RTC_CTRL_TEST, and OMAP_RTC_CTRL_ROUND_30S are also better off
being cleared.

Signed-off-by: Daniel Glöckner <dg@emlix.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent dd48c085

drivers/rtc/rtc-omap.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -368,7 +368,7 @@ static int __init omap_rtc_probe(struct platform_device *pdev)
		pr_info("%s: already running\n", pdev->name);

		/* force to 24 hour mode */
		new_ctrl = reg & ~(OMAP_RTC_CTRL_SPLIT\|OMAP_RTC_CTRL_AUTO_COMP);
		new_ctrl = reg & (OMAP_RTC_CTRL_SPLIT\|OMAP_RTC_CTRL_AUTO_COMP);
		new_ctrl \|= OMAP_RTC_CTRL_STOP;

		/* BOARD-SPECIFIC CUSTOMIZATION CAN GO HERE:

Admin message