[PATCH] lpfc 8.1.3: PCI hrd_type should be obtained with pci_read_config_byte() macro

[linux-2.6-omap-h63xx.git] / drivers / scsi / lpfc / lpfc_init.c

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 5fd98a345347a3a6aa74427c22e0bb8acafeb08b..71d2c8d3b001506b5735657693950d6687da7c9e 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/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;