Hi Martin, would you have a quick look at this one when you get a
moment? Bugging you for selfish reasons as I'm trying to get this
included in the next RHEL release. Thanks for any info.
On Tue, Aug 27, 2019 at 5:20 PM Govindarajulu Varadarajan
<gvaradar@xxxxxxxxx> wrote:
>
> pci_alloc_irq_vectors() returns number of vectors allocated.
> Fix the check for error condition.
>
> Fixes: cca678dfbad49 ("scsi: fnic: switch to pci_alloc_irq_vectors")
> Acked-by: Satish Kharat <satishkh@xxxxxxxxx>
> Signed-off-by: Govindarajulu Varadarajan <gvaradar@xxxxxxxxx>
> ---
> drivers/scsi/fnic/fnic_isr.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/scsi/fnic/fnic_isr.c b/drivers/scsi/fnic/fnic_isr.c
> index da4602b63495..2fb2731f50fb 100644
> --- a/drivers/scsi/fnic/fnic_isr.c
> +++ b/drivers/scsi/fnic/fnic_isr.c
> @@ -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;
> --
> 2.21.0
>
