[SCSI] be2iscsi: Set num_cpu = 1 if pci_enable_msix fails
authorJayamohan Kallickal <jayamohan.kallickal@emulex.com>
Wed, 4 Apr 2012 04:41:41 +0000 (23:41 -0500)
committerJames Bottomley <JBottomley@Parallels.com>
Wed, 25 Apr 2012 08:08:14 +0000 (09:08 +0100)
Signed-off-by: Jayamohan Kallickal <jayamohan.kallickal@emulex.com>
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
drivers/scsi/be2iscsi/be_main.c

index 185cf394b9f0ddbd17fae46256e755ab7df0da00..f69c56bd9b235088d1b82625e73fba2b71374b36 100644 (file)
@@ -4282,8 +4282,11 @@ static int __devinit beiscsi_dev_probe(struct pci_dev *pcidev,
        phba->num_cpus = num_cpus;
        SE_DEBUG(DBG_LVL_8, "num_cpus = %d\n", phba->num_cpus);
 
-       if (enable_msix)
+       if (enable_msix) {
                beiscsi_msix_enable(phba);
+               if (!phba->msix_enabled)
+                       phba->num_cpus = 1;
+       }
        ret = be_ctrl_init(phba, pcidev);
        if (ret) {
                shost_printk(KERN_ERR, phba->shost, "beiscsi_dev_probe-"