git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
[pandora-kernel.git]
/
drivers
/
rtc
/
rtc-ds1305.c
diff --git
a/drivers/rtc/rtc-ds1305.c
b/drivers/rtc/rtc-ds1305.c
index
fc372df
..
8f410e5
100644
(file)
--- a/
drivers/rtc/rtc-ds1305.c
+++ b/
drivers/rtc/rtc-ds1305.c
@@
-499,10
+499,7
@@
static void ds1305_work(struct work_struct *work)
if (!test_bit(FLAG_EXITING, &ds1305->flags))
enable_irq(spi->irq);
- /* rtc_update_irq() requires an IRQ-disabled context */
- local_irq_disable();
rtc_update_irq(ds1305->rtc, 1, RTC_AF | RTC_IRQF);
- local_irq_enable();
}
/*