From 8b0e19b27370d82decbd8f24b7a3b8f37dac1059 Mon Sep 17 00:00:00 2001 From: Jamie Wellnitz Date: Tue, 28 Feb 2006 22:33:05 -0500 Subject: [PATCH] --- yaml --- r: 22571 b: refs/heads/master c: 719396b48ce6310ab43d7432b6d7f2a330a831b3 h: refs/heads/master i: 22569: 6ebbfae077f8b744a0d70b747c98ca5c8d778e28 22567: 70176f1bb0f873ff07e090534a681725e9171e2d v: v3 --- [refs] | 2 +- trunk/drivers/scsi/lpfc/lpfc_init.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ca9aa0cbcbac..6365fe645c08 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 74b72a59b8d42d31aa6ffac8f10ca7a784be392c +refs/heads/master: 719396b48ce6310ab43d7432b6d7f2a330a831b3 diff --git a/trunk/drivers/scsi/lpfc/lpfc_init.c b/trunk/drivers/scsi/lpfc/lpfc_init.c index 5fd98a345347..71d2c8d3b001 100644 --- a/trunk/drivers/scsi/lpfc/lpfc_init.c +++ b/trunk/drivers/scsi/lpfc/lpfc_init.c @@ -796,9 +796,9 @@ lpfc_get_hba_model_desc(struct lpfc_hba * phba, uint8_t * mdp, uint8_t * descp) lpfc_vpd_t *vp; uint16_t dev_id = phba->pcidev->device; uint16_t dev_subid = phba->pcidev->subsystem_device; - uint8_t hdrtype = phba->pcidev->hdr_type; + uint8_t hdrtype; int max_speed; - char * ports = (hdrtype == 0x80) ? "2-port " : ""; + char * ports; struct { char * name; int max_speed; @@ -806,6 +806,8 @@ lpfc_get_hba_model_desc(struct lpfc_hba * phba, uint8_t * mdp, uint8_t * descp) char * bus; } m; + pci_read_config_byte(phba->pcidev, PCI_HEADER_TYPE, &hdrtype); + ports = (hdrtype == 0x80) ? "2-port " : ""; if (mdp && mdp[0] != '\0' && descp && descp[0] != '\0') return;