Add LP6000 PCI ID Fix driver not seeing LP6000. Fix: add PCI id to the pci_device_id table and a short description for the HBA in get_hba_model_desc(). Also add a default clause to the switch statement that parses the various PCI ID's. Signed-off-by: James Smart <James.Smart@xxxxxxxxxx> --- scsi-misc-2.6-20050620-jsmart/drivers/scsi/lpfc/lpfc_init.c | 8 ++++++++ 1 files changed, 8 insertions(+) diff -puN drivers/scsi/lpfc/lpfc_init.c~lp6000 drivers/scsi/lpfc/lpfc_init.c --- scsi-misc-2.6-20050620/drivers/scsi/lpfc/lpfc_init.c~lp6000 2005-06-25 09:42:15.000000000 -0400 +++ scsi-misc-2.6-20050620-jsmart/drivers/scsi/lpfc/lpfc_init.c 2005-06-25 09:42:15.000000000 -0400 @@ -780,6 +780,9 @@ lpfc_get_hba_model_desc(struct lpfc_hba pci_read_config_dword(phba->pcidev, PCI_VENDOR_ID, &id); switch ((id >> 16) & 0xffff) { + case PCI_DEVICE_ID_FIREFLY: + strcpy(str, "LP6000 1"); + break; case PCI_DEVICE_ID_SUPERFLY: if (vp->rev.biuRev >= 1 && vp->rev.biuRev <= 3) strcpy(str, "LP7000 1"); @@ -837,6 +840,9 @@ lpfc_get_hba_model_desc(struct lpfc_hba case PCI_DEVICE_ID_LP10000S: strcpy(str, "LP10000-S 2"); break; + default: + memset(str, 0, 16); + break; } if (mdp) sscanf(str, "%s", mdp); @@ -1662,6 +1668,8 @@ lpfc_pci_remove_one(struct pci_dev *pdev static struct pci_device_id lpfc_id_table[] = { {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_VIPER, PCI_ANY_ID, PCI_ANY_ID, }, + {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_FIREFLY, + PCI_ANY_ID, PCI_ANY_ID, }, {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_THOR, PCI_ANY_ID, PCI_ANY_ID, }, {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PEGASUS, _ - : send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html