Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6

[mirror_ubuntu-bionic-kernel.git] / drivers / rtc / rtc-ds1305.c

diff --git a/drivers/rtc/rtc-ds1305.c b/drivers/rtc/rtc-ds1305.c
index fc372df6534b5e93b3296913be692188cd5c1d41..8f410e59d9f536583c4a1509e65b2ecacd70bbcd 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();
 }
 
 /*