--- aha1542.c.orig	Fri Oct 12 23:35:53 2001
+++ aha1542.c	Sat Feb 28 21:30:27 2004
@@ -23,6 +23,9 @@
  *        19-Jul-99
  *  Modified by Adam Fritzler <mid@auk.cx>
  *        Added proper detection of the AHA-1640 (MCA version of AHA-1540)
+ *  Modified by Bruce Robson <bns_robson@hotmail.com>
+ *        Added a delay after activating a PNP card (needed by AHA-1542CP)
+ *        28-Feb-04
  */
 
 #include <linux/config.h>
@@ -1174,6 +1177,10 @@
 			   the DMA set up that is enough */
 			   
 			printk(KERN_INFO "ISAPnP found an AHA1535 at I/O 0x%03X\n", bases[indx]);
+
+			/* aha1542_test_port fails for AHA-1542CP if we don't wait for the card */
+			/* n.b. In 2.6.1 the driver calls pnp_port_valid */
+			mdelay(100);	/* I've made no attempt to minimise this */
 		}
 	}
 	for (indx = 0; indx < sizeof(bases) / sizeof(bases[0]); indx++)
@@ -1189,8 +1196,10 @@
 				printk(KERN_ERR "Invalid address for shpnt with 1542.\n");
 				goto unregister;
 			}
-			if (!aha1542_test_port(bases[indx], shpnt))
+			if (!aha1542_test_port(bases[indx], shpnt)) {
+				printk(KERN_INFO "aha1542 probed 0x%03X, card not at this address\n", bases[indx]);
 				goto unregister;
+			}
 
 
 			base_io = bases[indx];