Automerge

drivers/ide/ide-timing.h

@@ -244,6 +244,14 @@ static int ide_timing_compute(ide_drive_t *drive, short speed, struct ide_timing
 		ide_timing_merge(&p, t, t, IDE_TIMING_CYCLE | IDE_TIMING_CYC8B);
 	}
 
+/*
+ * If the drive is an ATAPI device it may need slower address setup timing,
+ * so we stay on the safe side.
+ */
+
+	if (drive->media != ide_disk)
+		p.setup = 120;
+
 /*
  * Convert the timing to bus clock counts.
  */