lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 552/639] scsi: fnic: fix msix interrupt allocation
    Date
    From: Govindarajulu Varadarajan <gvaradar@cisco.com>

    [ Upstream commit 3ec24fb4c035e9cbb2f02a48640a09aa913442a2 ]

    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")
    Link: https://lore.kernel.org/r/20190827211340.1095-1-gvaradar@cisco.com
    Signed-off-by: Govindarajulu Varadarajan <gvaradar@cisco.com>
    Acked-by: Satish Kharat <satishkh@cisco.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 4e3a50202e8c5..d28088218c364 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.20.1


    \
     
     \ /
      Last update: 2020-01-24 12:31    [W:6.614 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site