diff options
| author | James Hogan <james@albanarts.com> | 2010-03-05 16:44:31 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-06 14:26:48 -0500 |
| commit | 5a98c04d78c896d52baef20ffc11f6d1ba6eb786 (patch) | |
| tree | e4ce58fdd2b0b3bbd6c4a6c5a8c40209db00d83d | |
| parent | 9407351d7cce01a9ada942f00201e92e2541d9cb (diff) | |
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>
| -rw-r--r-- | drivers/rtc/rtc-coh901331.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-coh901331.c b/drivers/rtc/rtc-coh901331.c index 03ea530981d1..44c4399ee714 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) | |||
| 271 | { | 271 | { |
| 272 | struct coh901331_port *rtap = dev_get_drvdata(&pdev->dev); | 272 | struct coh901331_port *rtap = dev_get_drvdata(&pdev->dev); |
| 273 | 273 | ||
| 274 | if (device_may_wakeup(&pdev->dev)) | 274 | if (device_may_wakeup(&pdev->dev)) { |
| 275 | disable_irq_wake(rtap->irq); | 275 | disable_irq_wake(rtap->irq); |
| 276 | else | 276 | } else { |
| 277 | clk_enable(rtap->clk); | 277 | clk_enable(rtap->clk); |
| 278 | writel(rtap->irqmaskstore, rtap->virtbase + COH901331_IRQ_MASK); | 278 | writel(rtap->irqmaskstore, rtap->virtbase + COH901331_IRQ_MASK); |
| 279 | clk_disable(rtap->clk); | 279 | clk_disable(rtap->clk); |
| 280 | } | ||
| 280 | return 0; | 281 | return 0; |
| 281 | } | 282 | } |
| 282 | #else | 283 | #else |
