From: Jayamohan Kallickal <jayamohan.kallickal@emulex.com>
Date: Wed, 4 Apr 2012 04:41:41 +0000 (-0500)
Subject: [SCSI] be2iscsi: Set num_cpu = 1 if pci_enable_msix fails
X-Git-Tag: v3.5-rc1~172^2~80
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b547f2d699c48e1defbbe7e9349d4bfca33bd219;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

[SCSI] be2iscsi: Set num_cpu = 1 if pci_enable_msix fails

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>
---

diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index 185cf39..f69c56b 100644
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -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-"