Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ec24fb4 authored by Govindarajulu Varadarajan's avatar Govindarajulu Varadarajan Committed by Martin K. Petersen
Browse files

scsi: fnic: fix msix interrupt allocation 

pci_alloc_irq_vectors() returns number of vectors allocated.  Fix the check
for error condition.

Fixes: cca678df ("scsi: fnic: switch to pci_alloc_irq_vectors")
Link: https://lore.kernel.org/r/20190827211340.1095-1-gvaradar@cisco.com


Signed-off-by: default avatarGovindarajulu Varadarajan <gvaradar@cisco.com>
Acked-by: default avatarSatish Kharat <satishkh@cisco.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 90302e95

drivers/scsi/fnic/fnic_isr.c

+2 −2
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ int fnic_set_intr_mode(struct fnic *fnic) 
		int vecs = n + m + o + 1;



		if (pci_alloc_irq_vectors(fnic->pdev, vecs, vecs,

				PCI_IRQ_MSIX) < 0) {

				PCI_IRQ_MSIX) == vecs) {

			fnic->rq_count = n;

			fnic->raw_wq_count = m;

			fnic->wq_copy_count = o;
@@ -280,7 +280,7 @@ int fnic_set_intr_mode(struct fnic *fnic) 
	    fnic->wq_copy_count >= 1 &&

	    fnic->cq_count >= 3 &&

	    fnic->intr_count >= 1 &&

	    pci_alloc_irq_vectors(fnic->pdev, 1, 1, PCI_IRQ_MSI) < 0) {

	    pci_alloc_irq_vectors(fnic->pdev, 1, 1, PCI_IRQ_MSI) == 1) {

		fnic->rq_count = 1;

		fnic->raw_wq_count = 1;

		fnic->wq_copy_count = 1;