lkml.org 
[lkml]   [2011]   [May]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[21/71] drivers/rtc/rtc-s3c.c: fixup wake support for rtc
    2.6.38-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Ben Dooks <ben-linux@fluff.org>

    commit 52cd4e5c620af9e21b5298bf01844b98573505a7 upstream.

    The driver is not balancing set_irq and disable_irq_wake() calls, so
    ensure that it keeps track of whether the wake is enabled.

    The fixes the following error on S3C6410 devices:

    WARNING: at kernel/irq/manage.c:382 set_irq_wake+0x84/0xec()
    Unbalanced IRQ 92 wake disable

    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Cc: Alessandro Zummo <a.zummo@towertech.it>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/rtc/rtc-s3c.c | 13 ++++++++++---
    1 file changed, 10 insertions(+), 3 deletions(-)

    --- a/drivers/rtc/rtc-s3c.c
    +++ b/drivers/rtc/rtc-s3c.c
    @@ -46,6 +46,7 @@ static struct clk *rtc_clk;
    static void __iomem *s3c_rtc_base;
    static int s3c_rtc_alarmno = NO_IRQ;
    static int s3c_rtc_tickno = NO_IRQ;
    +static bool wake_en;
    static enum s3c_cpu_type s3c_rtc_cpu_type;

    static DEFINE_SPINLOCK(s3c_rtc_pie_lock);
    @@ -597,8 +598,12 @@ static int s3c_rtc_suspend(struct platfo
    }
    s3c_rtc_enable(pdev, 0);

    - if (device_may_wakeup(&pdev->dev))
    - enable_irq_wake(s3c_rtc_alarmno);
    + if (device_may_wakeup(&pdev->dev) && !wake_en) {
    + if (enable_irq_wake(s3c_rtc_alarmno) == 0)
    + wake_en = true;
    + else
    + dev_err(&pdev->dev, "enable_irq_wake failed\n");
    + }

    return 0;
    }
    @@ -614,8 +619,10 @@ static int s3c_rtc_resume(struct platfor
    writew(tmp | ticnt_en_save, s3c_rtc_base + S3C2410_RTCCON);
    }

    - if (device_may_wakeup(&pdev->dev))
    + if (device_may_wakeup(&pdev->dev) && wake_en) {
    disable_irq_wake(s3c_rtc_alarmno);
    + wake_en = false;
    + }

    return 0;
    }



    \
     
     \ /
      Last update: 2011-05-19 20:23    [W:2.692 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site