--- cpqfcTSinit.c-orig	Wed Nov 13 11:05:10 2002
+++ cpqfcTSinit.c	Thu Nov 14 12:48:48 2002
@@ -242,6 +242,10 @@
 
 		while ((PciDev = pci_find_device(cpqfc_boards[i].vendor_id, cpqfc_boards[i].device_id, PciDev))) {
 
+			if (pci_enable_device(PciDev) != 0) {
+				printk(KERN_WARNING "cpqfc: pci_enable_devive failed, skipping.\n");
+				continue;
+			}
 			if (pci_set_dma_mask(PciDev, CPQFCTS_DMA_MASK) != 0) {
 				printk(KERN_WARNING "cpqfc: HBA cannot support required DMA mask, skipping.\n");
 				continue;
@@ -411,6 +415,7 @@
 	// can we find an FC device mapping to this SCSI target?
 	DumCmnd.channel = ScsiDev->channel;	// For searching
 	DumCmnd.target = ScsiDev->id;
+	DumCmnd.lun = ScsiDev->lun;
 	pLoggedInPort = fcFindLoggedInPort(fcChip, &DumCmnd,	// search Scsi Nexus
 					   0,	// DON'T search linked list for FC port id
 					   NULL,	// DON'T search linked list for FC WWN