1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c
index fc80a325a1e6..27e270e00a10 100644
--- a/drivers/scsi/bfa/bfad.c
+++ b/drivers/scsi/bfa/bfad.c
@@ -1802,7 +1802,7 @@ out:
 static u32 *
 bfad_load_fwimg(struct pci_dev *pdev)
 {
-        if (pdev->device == BFA_PCI_DEVICE_ID_CT2) {
+        if (bfa_asic_id_ct2(pdev->device)) {
                 if (bfi_image_ct2_size == 0)
                         bfad_read_firmware(pdev, &bfi_image_ct2,
                                 &bfi_image_ct2_size, BFAD_FW_FILE_CT2);
@@ -1812,12 +1812,14 @@ bfad_load_fwimg(struct pci_dev *pdev)
                         bfad_read_firmware(pdev, &bfi_image_ct,
                                 &bfi_image_ct_size, BFAD_FW_FILE_CT);
                 return bfi_image_ct;
-        } else {
+        } else if (bfa_asic_id_cb(pdev->device)) {
                 if (bfi_image_cb_size == 0)
                         bfad_read_firmware(pdev, &bfi_image_cb,
                                 &bfi_image_cb_size, BFAD_FW_FILE_CB);
                 return bfi_image_cb;
         }
+
+        return NULL;
 }
 
 static void