---

yaml --- r: 302456 b: refs/heads/master c: b547f2d h: refs/heads/master v: v3
git-mirror · Apr 25, 2012 · e57dcfa · e57dcfa
1 parent ce0cdcb
commit e57dcfa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5b9323b9514d2d5d2b09d8e1b7a93f5bbf047f0
+refs/heads/master: b547f2d699c48e1defbbe7e9349d4bfca33bd219
diff --git a/trunk/drivers/scsi/be2iscsi/be_main.c b/trunk/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-"