From 9acc4996b2db9f8d5c07e5d1fb83ee51c7d5042c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Gl=C3=B6ckner?= Date: Wed, 3 Aug 2011 16:21:02 -0700 Subject: [PATCH] --- yaml --- r: 262301 b: refs/heads/master c: 12b3e038e5bb4860c17d001e92a6fa9964c0a7b9 h: refs/heads/master i: 262299: 9292886307919de2d3ae255268d20f3064bddfbd v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-omap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e3a972b8d0de..fa5fed0cf487 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dd48c085c1cdf9446f92826f1fd451167fb6c2fd +refs/heads/master: 12b3e038e5bb4860c17d001e92a6fa9964c0a7b9 diff --git a/trunk/drivers/rtc/rtc-omap.c b/trunk/drivers/rtc/rtc-omap.c index bcae8dd41496..7789002bdd5c 100644 --- a/trunk/drivers/rtc/rtc-omap.c +++ b/trunk/drivers/rtc/rtc-omap.c @@ -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: