patch-2.2.19 linux/drivers/block/hd.c

• Lines: 32
• Date: Sun Mar 25 11:37:30 2001
• Orig file: v2.2.18/drivers/block/hd.c
• Orig date: Sun Mar 25 11:28:21 2001

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.18/drivers/block/hd.c linux/drivers/block/hd.c
@@ -703,12 +703,12 @@
 static void hd_geninit(struct gendisk *ignored)
 {
 	int drive;
-	unsigned long flags;
 
 #ifdef __i386__
 	if (!NR_HD) {
 		extern struct drive_info drive_info;
 		unsigned char *BIOS = (unsigned char *) &drive_info;
+		unsigned long flags;
 		int cmos_disks;
 
 		for (drive=0 ; drive<2 ; drive++) {
@@ -747,13 +747,15 @@
 		
 	*/
                 spin_lock_irqsave(&rtc_lock, flags);
-		if ((cmos_disks = CMOS_READ(0x12)) & 0xf0) {
+		cmos_disks = CMOS_READ(0x12);
+		spin_unlock_irqrestore(&rtc_lock, flags);
+
+		if (cmos_disks & 0xf0) {
 			if (cmos_disks & 0x0f)
 				NR_HD = 2;
 			else
 				NR_HD = 1;
 		}
-		spin_unlock_irqrestore(&rtc_lock, flags);
 	}
 #endif /* __i386__ */
 	for (drive=0 ; drive < NR_HD ; drive++) {