diff options
author | Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2009-06-18 19:49:09 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-19 19:46:05 -0400 |
commit | e6229bec25be4ba00f31dd26e25721cc96c22262 (patch) | |
tree | a27e4c51dd8b9aaeb589a147a22bbd06bde77cf0 /drivers/rtc/rtc-ds1305.c | |
parent | 575c5807f6842422e9fe2432fd48dfcc1d7aef41 (diff) |
rtc: make rtc_update_irq callable with irqs enabled
The rtc_update_irq() might be called with irqs enabled, if a interrupt
handler was registered without IRQF_DISABLED. Use
spin_lock_irqsave/spin_unlock_irqrestore instead of spin_lock/spin_unlock.
Also update kerneldoc and drivers which do extra work to follow the
current interface spec, as suggestted by David Brownell.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/rtc/rtc-ds1305.c')
-rw-r--r-- | drivers/rtc/rtc-ds1305.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/rtc/rtc-ds1305.c b/drivers/rtc/rtc-ds1305.c index fc372df6534b..8f410e59d9f5 100644 --- a/drivers/rtc/rtc-ds1305.c +++ b/drivers/rtc/rtc-ds1305.c | |||
@@ -499,10 +499,7 @@ static void ds1305_work(struct work_struct *work) | |||
499 | if (!test_bit(FLAG_EXITING, &ds1305->flags)) | 499 | if (!test_bit(FLAG_EXITING, &ds1305->flags)) |
500 | enable_irq(spi->irq); | 500 | enable_irq(spi->irq); |
501 | 501 | ||
502 | /* rtc_update_irq() requires an IRQ-disabled context */ | ||
503 | local_irq_disable(); | ||
504 | rtc_update_irq(ds1305->rtc, 1, RTC_AF | RTC_IRQF); | 502 | rtc_update_irq(ds1305->rtc, 1, RTC_AF | RTC_IRQF); |
505 | local_irq_enable(); | ||
506 | } | 503 | } |
507 | 504 | ||
508 | /* | 505 | /* |