Index: comedi/drivers/amplc_pc236.c
===================================================================
RCS file: /var/cvs/comedi/comedi/drivers/amplc_pc236.c,v
retrieving revision 1.9
diff -u -r1.9 amplc_pc236.c
--- comedi/drivers/amplc_pc236.c	22 Jan 2005 14:22:18 -0000	1.9
+++ comedi/drivers/amplc_pc236.c	24 Jan 2005 12:05:12 -0000
@@ -192,24 +192,22 @@
 			if (pci_id->driver_data == thisboard->model)
 				break;
 		}
-		if (pci_id->driver_data != thisboard->model) {
+		if (pci_id->vendor == 0) {
 			printk("bug! cannot determine board type!\n");
 			return -EINVAL;
 		}
 
 		/* Look for matching PCI device. */
-		for(pci_dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, NULL); pci_dev != NULL ; 
-			pci_dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, pci_dev)) {
+		for(pci_dev = pci_find_device(pci_id->vendor, pci_id->device,
+					NULL); pci_dev != NULL; 
+				pci_dev = pci_find_device(pci_id->vendor,
+					pci_id->device, pci_dev)) {
 			/* If bus/slot specified, check them. */
 			if (bus || slot) {
 				if (bus != pci_dev->bus->number
 						|| slot != PCI_SLOT(pci_dev->devfn))
 					continue;
 			}
-			if (pci_dev->vendor != pci_id->vendor)
-				continue;
-			if (pci_dev->device != pci_id->device)
-				continue;
 #if 0
 			if (pci_id->subvendor != PCI_ANY_ID) {
 				if (pci_dev->subsystem_vendor != pci_id->subvendor)
Index: comedi/drivers/amplc_pc263.c
===================================================================
RCS file: /var/cvs/comedi/comedi/drivers/amplc_pc263.c,v
retrieving revision 1.5
diff -u -r1.5 amplc_pc263.c
--- comedi/drivers/amplc_pc263.c	22 Jan 2005 14:22:19 -0000	1.5
+++ comedi/drivers/amplc_pc263.c	24 Jan 2005 12:05:13 -0000
@@ -163,24 +163,22 @@
 			if (pci_id->driver_data == thisboard->model)
 				break;
 		}
-		if (pci_id->driver_data != thisboard->model) {
+		if (pci_id->vendor == 0) {
 			printk("bug! cannot determine board type!\n");
 			return -EINVAL;
 		}
 
 		/* Look for matching PCI device. */
-		for(pci_dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, NULL); pci_dev != NULL ; 
-			pci_dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, pci_dev)) {
+		for(pci_dev = pci_find_device(pci_id->vendor, pci_id->device,
+					NULL); pci_dev != NULL; 
+				pci_dev = pci_find_device(pci_id->vendor,
+					pci_id->device, pci_dev)) {
 			/* If bus/slot specified, check them. */
 			if (bus || slot) {
 				if (bus != pci_dev->bus->number
 						|| slot != PCI_SLOT(pci_dev->devfn))
 					continue;
 			}
-			if (pci_dev->vendor != pci_id->vendor)
-				continue;
-			if (pci_dev->device != pci_id->device)
-				continue;
 #if 0
 			if (pci_id->subvendor != PCI_ANY_ID) {
 				if (pci_dev->subsystem_vendor != pci_id->subvendor)