]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
rtc-omap: fix initialization of control register
authorDaniel Glöckner <dg@emlix.com>
Wed, 3 Aug 2011 23:21:02 +0000 (16:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Aug 2011 00:25:20 +0000 (14:25 -1000)
commit12b3e038e5bb4860c17d001e92a6fa9964c0a7b9
tree73bed0f33454932de3bc1d9aa49cc255a4f072fb
parentdd48c085c1cdf9446f92826f1fd451167fb6c2fd
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>
drivers/rtc/rtc-omap.c