From 2e4808c1d889443480f6cd91306cd2191faf5a75 Mon Sep 17 00:00:00 2001
From: James Hogan <james@albanarts.com>
Date: Fri, 5 Mar 2010 13:44:31 -0800
Subject: [PATCH] --- yaml --- r: 186336 b: refs/heads/master c:
 5a98c04d78c896d52baef20ffc11f6d1ba6eb786 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/rtc/rtc-coh901331.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ea20050dae3c..319dca011d91 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9407351d7cce01a9ada942f00201e92e2541d9cb
+refs/heads/master: 5a98c04d78c896d52baef20ffc11f6d1ba6eb786
diff --git a/trunk/drivers/rtc/rtc-coh901331.c b/trunk/drivers/rtc/rtc-coh901331.c
index 03ea530981d1..44c4399ee714 100644
--- a/trunk/drivers/rtc/rtc-coh901331.c
+++ b/trunk/drivers/rtc/rtc-coh901331.c
@@ -271,12 +271,13 @@ static int coh901331_resume(struct platform_device *pdev)
 {
 	struct coh901331_port *rtap = dev_get_drvdata(&pdev->dev);
 
-	if (device_may_wakeup(&pdev->dev))
+	if (device_may_wakeup(&pdev->dev)) {
 		disable_irq_wake(rtap->irq);
-	else
+	} else {
 		clk_enable(rtap->clk);
 		writel(rtap->irqmaskstore, rtap->virtbase + COH901331_IRQ_MASK);
 		clk_disable(rtap->clk);
+	}
 	return 0;
 }
 #else