From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: + rtc-coh901331-fix-braces-in-resume-code.patch added to -mm tree Date: Thu, 04 Mar 2010 12:38:40 -0800 Message-ID: <201003042038.o24Kcel1028539@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:34905 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756006Ab0CDUiy (ORCPT ); Thu, 4 Mar 2010 15:38:54 -0500 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: mm-commits@vger.kernel.org Cc: james@albanarts.com, a.zummo@towertech.it, linus.walleij@stericsson.com, stable@kernel.org 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 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 Acked-by: Linus Walleij Acked-by: Alessandro Zummo Cc: Signed-off-by: Andrew Morton --- 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