diff options
| author | Jayamohan Kallickal | 2012-04-04 06:41:41 +0200 |
|---|---|---|
| committer | James Bottomley | 2012-04-25 10:08:14 +0200 |
| commit | b547f2d699c48e1defbbe7e9349d4bfca33bd219 (patch) | |
| tree | 11b8f4540fe121db385fe96bd280a80282b85376 /drivers/scsi/be2iscsi | |
| parent | [SCSI] be2iscsi: Fix typo function name mismatch (diff) | |
| download | kernel-qcow2-linux-b547f2d699c48e1defbbe7e9349d4bfca33bd219.tar.gz kernel-qcow2-linux-b547f2d699c48e1defbbe7e9349d4bfca33bd219.tar.xz kernel-qcow2-linux-b547f2d699c48e1defbbe7e9349d4bfca33bd219.zip | |
[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, 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-" |