Prev: [109/145] thinkpad-acpi: make driver events work in NVRAM poll mode
Next: [046/145] drm/radeon/kms: Forbid creation of framebuffer with no valid GEM object
From: Greg KH on 12 Mar 2010 19:50
2.6.32-stable review patch. If anyone has any objections, please let me know.

----------------
From: James Hogan <james(a)albanarts.com>

commit 5a98c04d78c896d52baef20ffc11f6d1ba6eb786 upstream.

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(a)albanarts.com>
Acked-by: Linus Walleij <linus.walleij(a)stericsson.com>
Acked-by: Alessandro Zummo <a.zummo(a)towertech.it>
Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>

---
drivers/rtc/rtc-coh901331.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

--- a/drivers/rtc/rtc-coh901331.c
+++ b/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


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [109/145] thinkpad-acpi: make driver events work in NVRAM poll mode
Next: [046/145] drm/radeon/kms: Forbid creation of framebuffer with no valid GEM object