summaryrefslogtreecommitdiffstats
path: root/drivers/rtc
diff options
context:
space:
mode:
authorJames Hogan <james@albanarts.com>2010-03-05 13:44:31 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-06 11:26:48 -0800
commit5a98c04d78c896d52baef20ffc11f6d1ba6eb786 (patch)
treee4ce58fdd2b0b3bbd6c4a6c5a8c40209db00d83d /drivers/rtc
parent9407351d7cce01a9ada942f00201e92e2541d9cb (diff)
downloadop-kernel-dev-5a98c04d78c896d52baef20ffc11f6d1ba6eb786.zip
op-kernel-dev-5a98c04d78c896d52baef20ffc11f6d1ba6eb786.tar.gz
rtc-coh901331: fix braces in resume code
The else part of the if statement is indented but does not have braces around it. It clearly should since it uses clk_enable and clk_disable which are supposed to balance. Signed-off-by: James Hogan <james@albanarts.com> Acked-by: Linus Walleij <linus.walleij@stericsson.com> Acked-by: Alessandro Zummo <a.zummo@towertech.it> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/rtc')
-rw-r--r--drivers/rtc/rtc-coh901331.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-coh901331.c b/drivers/rtc/rtc-coh901331.c
index 03ea530..44c4399 100644
--- a/drivers/rtc/rtc-coh901331.c
+++ b/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
OpenPOWER on IntegriCloud