* + rtc-coh901331-fix-braces-in-resume-code.patch added to -mm tree
@ 2010-03-04 20:38 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2010-03-04 20:38 UTC (permalink / raw)
To: mm-commits; +Cc: james, a.zummo, linus.walleij, stable
The patch titled
rtc-coh901331: fix braces in resume code
has been added to the -mm tree. Its filename is
rtc-coh901331-fix-braces-in-resume-code.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: rtc-coh901331: fix braces in resume code
From: James Hogan <james@albanarts.com>
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>
---
drivers/rtc/rtc-coh901331.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff -puN drivers/rtc/rtc-coh901331.c~rtc-coh901331-fix-braces-in-resume-code drivers/rtc/rtc-coh901331.c
--- a/drivers/rtc/rtc-coh901331.c~rtc-coh901331-fix-braces-in-resume-code
+++ a/drivers/rtc/rtc-coh901331.c
@@ -271,12 +271,13 @@ static int coh901331_resume(struct platf
{
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
_
Patches currently in -mm which might be from james@albanarts.com are
rtc-coh901331-fix-braces-in-resume-code.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-03-04 20:38 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-04 20:38 + rtc-coh901331-fix-braces-in-resume-code.patch added to -mm tree akpm
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.