diff options
| author | Tejun Heo <tj@kernel.org> | 2010-12-17 15:16:46 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-12-17 15:16:46 +0100 |
| commit | 275c8b93288ef0c2281e414e069ea8ed4bad03f7 (patch) | |
| tree | df906ef901d7719d66944921c7436f5db718dc2f /drivers/scsi/pmcraid.c | |
| parent | 909ea96468096b07fbb41aaf69be060d92bd9271 (diff) | |
| parent | 8f1d97c79eb65de1d05799d6b81d79cd94169114 (diff) | |
Merge branch 'this_cpu_ops' into for-2.6.38
Diffstat (limited to 'drivers/scsi/pmcraid.c')
| -rw-r--r-- | drivers/scsi/pmcraid.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c index 5e76a624cb08..300d59f389da 100644 --- a/drivers/scsi/pmcraid.c +++ b/drivers/scsi/pmcraid.c @@ -62,6 +62,7 @@ static unsigned int pmcraid_debug_log; static unsigned int pmcraid_disable_aen; static unsigned int pmcraid_log_level = IOASC_LOG_LEVEL_MUST; +static unsigned int pmcraid_enable_msix; /* * Data structures to support multiple adapters by the LLD. @@ -4691,7 +4692,8 @@ pmcraid_register_interrupt_handler(struct pmcraid_instance *pinstance) int rc; struct pci_dev *pdev = pinstance->pdev; - if (pci_find_capability(pdev, PCI_CAP_ID_MSIX)) { + if ((pmcraid_enable_msix) && + (pci_find_capability(pdev, PCI_CAP_ID_MSIX))) { int num_hrrq = PMCRAID_NUM_MSIX_VECTORS; struct msix_entry entries[PMCRAID_NUM_MSIX_VECTORS]; int i; |