diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2014-07-30 01:37:37 -0700 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2014-07-30 01:37:37 -0700 |
| commit | a93cb871cdeace7de7d865555ed492e8bc8075b5 (patch) | |
| tree | 6d20b76c9682e67f4a94550dac4d08c2a80e83a6 /drivers/scsi/fnic/fnic_isr.c | |
| parent | f9e06c6904e5c48ea34e9734001e50b4c73837e4 (diff) | |
| parent | db1924d08dd4be3274771486664e7952439ee956 (diff) | |
| download | linux-next-a93cb871cdeace7de7d865555ed492e8bc8075b5.tar.gz | |
Merge remote-tracking branch 'scsi-queue/drivers-for-3.17' into for-next
Diffstat (limited to 'drivers/scsi/fnic/fnic_isr.c')
| -rw-r--r-- | drivers/scsi/fnic/fnic_isr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/fnic/fnic_isr.c b/drivers/scsi/fnic/fnic_isr.c index 7d9b54ae7f62..a0dd1b67a467 100644 --- a/drivers/scsi/fnic/fnic_isr.c +++ b/drivers/scsi/fnic/fnic_isr.c @@ -257,8 +257,8 @@ int fnic_set_intr_mode(struct fnic *fnic) fnic->raw_wq_count >= m && fnic->wq_copy_count >= o && fnic->cq_count >= n + m + o) { - if (!pci_enable_msix(fnic->pdev, fnic->msix_entry, - n + m + o + 1)) { + if (!pci_enable_msix_exact(fnic->pdev, fnic->msix_entry, + n + m + o + 1)) { fnic->rq_count = n; fnic->raw_wq_count = m; fnic->wq_copy_count = o; |