lkml.org 
[lkml]   [2013]   [Feb]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 24/66] drivers/rtc/rtc-isl1208.c: call rtc_update_irq() from the alarm irq handler
    3.2-stable review patch.  If anyone has any objections, please let me know.

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

    From: Jan Luebbe <jlu@pengutronix.de>

    commit 72fca4a4b32dc778b5b885c3498700e42b610d49 upstream.

    Previously the alarm event was not propagated into the RTC subsystem.
    By adding a call to rtc_update_irq, this fixes a timeout problem with
    the hwclock utility.

    Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
    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: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/rtc/rtc-isl1208.c | 3 +++
    1 file changed, 3 insertions(+)

    diff --git a/drivers/rtc/rtc-isl1208.c b/drivers/rtc/rtc-isl1208.c
    index afb7cfa..c016ad8 100644
    --- a/drivers/rtc/rtc-isl1208.c
    +++ b/drivers/rtc/rtc-isl1208.c
    @@ -506,6 +506,7 @@ isl1208_rtc_interrupt(int irq, void *data)
    {
    unsigned long timeout = jiffies + msecs_to_jiffies(1000);
    struct i2c_client *client = data;
    + struct rtc_device *rtc = i2c_get_clientdata(client);
    int handled = 0, sr, err;

    /*
    @@ -528,6 +529,8 @@ isl1208_rtc_interrupt(int irq, void *data)
    if (sr & ISL1208_REG_SR_ALM) {
    dev_dbg(&client->dev, "alarm!\n");

    + rtc_update_irq(rtc, 1, RTC_IRQF | RTC_AF);
    +
    /* Clear the alarm */
    sr &= ~ISL1208_REG_SR_ALM;
    sr = i2c_smbus_write_byte_data(client, ISL1208_REG_SR, sr);



    \
     
     \ /
      Last update: 2013-02-18 00:21    [W:4.096 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site