diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 23:56:24 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 23:56:24 -0600 |
| commit | cbe56159a3e60624b5f44cf48b640fa470436e34 (patch) | |
| tree | f3dd43243be6e840dc2b0386e91c4146a4f51620 /drivers/char/ds1302.c | |
| parent | 67c2b7d9d224232ee730b9c9444abed824b62e7a (diff) | |
| parent | 17e0e27020d028a790d97699aff85a43af5be472 (diff) | |
Merge branch 'master' into 83xx
Diffstat (limited to 'drivers/char/ds1302.c')
| -rw-r--r-- | drivers/char/ds1302.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/char/ds1302.c b/drivers/char/ds1302.c index bcdb107aa967..fada6ddefbae 100644 --- a/drivers/char/ds1302.c +++ b/drivers/char/ds1302.c @@ -120,7 +120,6 @@ get_rtc_time(struct rtc_time *rtc_tm) unsigned long flags; local_irq_save(flags); - local_irq_disable(); rtc_tm->tm_sec = CMOS_READ(RTC_SECONDS); rtc_tm->tm_min = CMOS_READ(RTC_MINUTES); @@ -219,7 +218,6 @@ rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd, BIN_TO_BCD(yrs); local_irq_save(flags); - local_irq_disable(); CMOS_WRITE(yrs, RTC_YEAR); CMOS_WRITE(mon, RTC_MONTH); CMOS_WRITE(day, RTC_DAY_OF_MONTH); |