patch-2.2.15 linux/drivers/block/ide-disk.c

• Lines: 19
• Date: Fri Apr 21 12:45:50 2000
• Orig file: v2.2.14/drivers/block/ide-disk.c
• Orig date: Tue Jan 4 21:18:44 2000

diff -u --new-file --recursive --exclude-from ../../exclude v2.2.14/drivers/block/ide-disk.c linux/drivers/block/ide-disk.c
@@ -571,7 +571,7 @@
 	drive->special.b.recalibrate  = 1;
 	if (OK_TO_RESET_CONTROLLER)
 		drive->mult_count = 0;
-	if (!drive->keep_settings)
+	if (!drive->keep_settings && !drive->using_dma)
 		drive->mult_req = 0;
 	if (drive->mult_req != drive->mult_count)
 		drive->special.b.set_multmode = 1;
@@ -799,9 +799,6 @@
 	/* Use physical geometry if what we have still makes no sense */
 	if ((!drive->head || drive->head > 16) &&
 	    id->heads && id->heads <= 16) {
-		if ((id->lba_capacity > 16514064) || (id->cyls == 0x3fff)) {
-			id->cyls = ((int)(id->lba_capacity/(id->heads * id->sectors)));
-		}
 		drive->cyl  = id->cyls;
 		drive->head = id->heads;
 		drive->sect = id->sectors;