diff options
Diffstat (limited to 'drivers/scsi/mpt2sas/mpt2sas_base.c')
-rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_base.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c index 5e69f468535f..8a59a772fdf2 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_base.c +++ b/drivers/scsi/mpt2sas/mpt2sas_base.c | |||
@@ -657,7 +657,7 @@ _base_sas_log_info(struct MPT2SAS_ADAPTER *ioc , u32 log_info) | |||
657 | return; | 657 | return; |
658 | 658 | ||
659 | /* eat the loginfos associated with task aborts */ | 659 | /* eat the loginfos associated with task aborts */ |
660 | if (ioc->ignore_loginfos && (log_info == 30050000 || log_info == | 660 | if (ioc->ignore_loginfos && (log_info == 0x30050000 || log_info == |
661 | 0x31140000 || log_info == 0x31130000)) | 661 | 0x31140000 || log_info == 0x31130000)) |
662 | return; | 662 | return; |
663 | 663 | ||
@@ -2060,12 +2060,10 @@ _base_display_ioc_capabilities(struct MPT2SAS_ADAPTER *ioc) | |||
2060 | { | 2060 | { |
2061 | int i = 0; | 2061 | int i = 0; |
2062 | char desc[16]; | 2062 | char desc[16]; |
2063 | u8 revision; | ||
2064 | u32 iounit_pg1_flags; | 2063 | u32 iounit_pg1_flags; |
2065 | u32 bios_version; | 2064 | u32 bios_version; |
2066 | 2065 | ||
2067 | bios_version = le32_to_cpu(ioc->bios_pg3.BiosVersion); | 2066 | bios_version = le32_to_cpu(ioc->bios_pg3.BiosVersion); |
2068 | pci_read_config_byte(ioc->pdev, PCI_CLASS_REVISION, &revision); | ||
2069 | strncpy(desc, ioc->manu_pg0.ChipName, 16); | 2067 | strncpy(desc, ioc->manu_pg0.ChipName, 16); |
2070 | printk(MPT2SAS_INFO_FMT "%s: FWVersion(%02d.%02d.%02d.%02d), " | 2068 | printk(MPT2SAS_INFO_FMT "%s: FWVersion(%02d.%02d.%02d.%02d), " |
2071 | "ChipRevision(0x%02x), BiosVersion(%02d.%02d.%02d.%02d)\n", | 2069 | "ChipRevision(0x%02x), BiosVersion(%02d.%02d.%02d.%02d)\n", |
@@ -2074,7 +2072,7 @@ _base_display_ioc_capabilities(struct MPT2SAS_ADAPTER *ioc) | |||
2074 | (ioc->facts.FWVersion.Word & 0x00FF0000) >> 16, | 2072 | (ioc->facts.FWVersion.Word & 0x00FF0000) >> 16, |
2075 | (ioc->facts.FWVersion.Word & 0x0000FF00) >> 8, | 2073 | (ioc->facts.FWVersion.Word & 0x0000FF00) >> 8, |
2076 | ioc->facts.FWVersion.Word & 0x000000FF, | 2074 | ioc->facts.FWVersion.Word & 0x000000FF, |
2077 | revision, | 2075 | ioc->pdev->revision, |
2078 | (bios_version & 0xFF000000) >> 24, | 2076 | (bios_version & 0xFF000000) >> 24, |
2079 | (bios_version & 0x00FF0000) >> 16, | 2077 | (bios_version & 0x00FF0000) >> 16, |
2080 | (bios_version & 0x0000FF00) >> 8, | 2078 | (bios_version & 0x0000FF00) >> 8, |