patch-2.3.10 linux/drivers/scsi/ppa.c

Next file: linux/drivers/scsi/qlogicfc.c
Previous file: linux/drivers/scsi/pas16.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.9/linux/drivers/scsi/ppa.c linux/drivers/scsi/ppa.c
@@ -158,14 +158,14 @@
 	 */
 	ppa_hosts[i].mode = PPA_NIBBLE;
 
-	if (modes & PARPORT_MODE_PCPS2)
+	if (modes & PARPORT_MODE_TRISTATE)
 	    ppa_hosts[i].mode = PPA_PS2;
 
-	if (modes & PARPORT_MODE_PCECPPS2) {
+	if (modes & PARPORT_MODE_ECP) {
 	    w_ecr(ppb, 0x20);
 	    ppa_hosts[i].mode = PPA_PS2;
 	}
-	if (modes & PARPORT_MODE_PCECPEPP)
+	if ((modes & PARPORT_MODE_EPP) && (modes & PARPORT_MODE_ECP))
 	    w_ecr(ppb, 0x80);
 
 	/* Done configuration */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)