lkml.org 
[lkml]   [2021]   [May]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 102/116] net: bnx2: Fix error return code in bnx2_init_board()
    Date
    From: Zhen Lei <thunder.leizhen@huawei.com>

    [ Upstream commit 28c66b6da4087b8cfe81c2ec0a46eb6116dafda9 ]

    Fix to return -EPERM from the error handling case instead of 0, as done
    elsewhere in this function.

    Fixes: b6016b767397 ("[BNX2]: New Broadcom gigabit network driver.")
    Reported-by: Hulk Robot <hulkci@huawei.com>
    Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
    Reviewed-by: Michael Chan <michael.chan@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/broadcom/bnx2.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
    index 122fdb80a789..9993f1162ac6 100644
    --- a/drivers/net/ethernet/broadcom/bnx2.c
    +++ b/drivers/net/ethernet/broadcom/bnx2.c
    @@ -8253,9 +8253,9 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
    BNX2_WR(bp, PCI_COMMAND, reg);
    } else if ((BNX2_CHIP_ID(bp) == BNX2_CHIP_ID_5706_A1) &&
    !(bp->flags & BNX2_FLAG_PCIX)) {
    -
    dev_err(&pdev->dev,
    "5706 A1 can only be used in a PCIX bus, aborting\n");
    + rc = -EPERM;
    goto err_out_unmap;
    }

    --
    2.30.2


    \
     
     \ /
      Last update: 2021-05-31 15:52    [W:4.030 / U:0.504 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site