diff options
author | Jayamohan Kallickal <jayamohan.kallickal@emulex.com> | 2012-04-04 00:41:41 -0400 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2012-04-25 04:08:14 -0400 |
commit | b547f2d699c48e1defbbe7e9349d4bfca33bd219 (patch) | |
tree | 11b8f4540fe121db385fe96bd280a80282b85376 /drivers/scsi/be2iscsi | |
parent | b5b9323b9514d2d5d2b09d8e1b7a93f5bbf047f0 (diff) |
[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>
Diffstat (limited to 'drivers/scsi/be2iscsi')
-rw-r--r-- | drivers/scsi/be2iscsi/be_main.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c index 185cf394b9f0..f69c56bd9b23 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, | |||
4282 | phba->num_cpus = num_cpus; | 4282 | phba->num_cpus = num_cpus; |
4283 | SE_DEBUG(DBG_LVL_8, "num_cpus = %d\n", phba->num_cpus); | 4283 | SE_DEBUG(DBG_LVL_8, "num_cpus = %d\n", phba->num_cpus); |
4284 | 4284 | ||
4285 | if (enable_msix) | 4285 | if (enable_msix) { |
4286 | beiscsi_msix_enable(phba); | 4286 | beiscsi_msix_enable(phba); |
4287 | if (!phba->msix_enabled) | ||
4288 | phba->num_cpus = 1; | ||
4289 | } | ||
4287 | ret = be_ctrl_init(phba, pcidev); | 4290 | ret = be_ctrl_init(phba, pcidev); |
4288 | if (ret) { | 4291 | if (ret) { |
4289 | shost_printk(KERN_ERR, phba->shost, "beiscsi_dev_probe-" | 4292 | shost_printk(KERN_ERR, phba->shost, "beiscsi_dev_probe-" |