---

yaml --- r: 47924 b: refs/heads/master c: efc4713 h: refs/heads/master v: v3
git-mirror · Feb 12, 2007 · 97e5b02 · 97e5b02
1 parent 5ed56f9
commit 97e5b02
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2869b23e4b95cbafffcd2fe110d77aff8c218405
+refs/heads/master: efc47135e4b6f7e7d81332f50ef68e4a42819d20
diff --git a/trunk/drivers/char/ds1302.c b/trunk/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);