projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
275aaa6
)
drivers/rtc/rtc-isl1208.c: call rtc_update_irq() from the alarm irq handler
author
Jan Luebbe
<
[email protected]
>
Mon, 4 Feb 2013 22:28:53 +0000
(14:28 -0800)
committer
Linus Torvalds
<
[email protected]
>
Tue, 5 Feb 2013 09:38:49 +0000
(20:38 +1100)
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 <
[email protected]
>
Cc: Alessandro Zummo <
[email protected]
>
Cc: <
[email protected]
>
Signed-off-by: Andrew Morton <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
drivers/rtc/rtc-isl1208.c
patch
|
blob
|
history
diff --git
a/drivers/rtc/rtc-isl1208.c
b/drivers/rtc/rtc-isl1208.c
index afb7cfa85ccc04ac637268ee0bba4240f05c12d3..c016ad81767a9d1be4697c267072a124f4398fc6 100644
(file)
--- 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);