diff options
| author | Jan Luebbe <jlu@pengutronix.de> | 2013-02-04 14:28:53 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-11 08:47:18 -0800 |
| commit | 1a9277bba9cfcfac12b204dcf72b0cb019b3b65d (patch) | |
| tree | 6d231ecaa8e200bf056dee6ed2db7bd51477cf5f /drivers | |
| parent | 0b0a57362b8d1585f6909333fc667c73bae8205c (diff) | |
| download | linux-3.10-1a9277bba9cfcfac12b204dcf72b0cb019b3b65d.tar.gz linux-3.10-1a9277bba9cfcfac12b204dcf72b0cb019b3b65d.tar.bz2 linux-3.10-1a9277bba9cfcfac12b204dcf72b0cb019b3b65d.zip | |
drivers/rtc/rtc-isl1208.c: call rtc_update_irq() from the alarm irq handler
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/rtc/rtc-isl1208.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/rtc/rtc-isl1208.c b/drivers/rtc/rtc-isl1208.c index dd2aeee6c66..8f8c8ae3523 100644 --- a/drivers/rtc/rtc-isl1208.c +++ b/drivers/rtc/rtc-isl1208.c @@ -494,6 +494,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; /* @@ -516,6 +517,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); |