ChangeSet@1.884, 2002-12-19 11:23:11+01:00, vojtech@suse.cz
  VIA IDE: Always use slow address setup timings for ATAPI devices.


 via82cxxx.c |   19 ++++++-------------
 1 files changed, 6 insertions(+), 13 deletions(-)


diff -Nru a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
--- a/drivers/ide/pci/via82cxxx.c	Thu Dec 19 11:23:42 2002
+++ b/drivers/ide/pci/via82cxxx.c	Thu Dec 19 11:23:42 2002
@@ -1,16 +1,5 @@
 /*
- * $Id: via82cxxx.c,v 3.35-ac2 2002/09/111 Alan Exp $
- *
- *  Copyright (c) 2000-2001 Vojtech Pavlik
- *
- *  Based on the work of:
- *	Michel Aubry
- *	Jeff Garzik
- *	Andre Hedrick
- */
-
-/*
- * Version 3.35
+ * Version 3.36
  *
  * VIA IDE driver for Linux. Supported southbridges:
  *
@@ -152,7 +141,7 @@
 	via_print("----------VIA BusMastering IDE Configuration"
 		"----------------");
 
-	via_print("Driver Version:                     3.35-ac");
+	via_print("Driver Version:                     3.36");
 	via_print("South Bridge:                       VIA %s",
 		via_config->name);
 
@@ -351,6 +340,10 @@
 		ide_timing_compute(peer, peer->current_speed, &p, T, UT);
 		ide_timing_merge(&p, &t, &t, IDE_TIMING_8BIT);
 	}
+
+	/* Always use 4 address setup clocks on ATAPI devices */
+	if (drive->media != ide_disk)
+		t.setup = 4;
 
 	via_set_speed(HWIF(drive)->pci_dev, drive->dn, &t);