lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 165/453] qtnfmac: fix error return code in qtnf_pcie_probe()
    Date
    From: Wang Hai <wanghai38@huawei.com>

    [ Upstream commit 31e07aa33fa7cdc93fa91c3f78f031e8d38862c2 ]

    Fix to return a negative error code from the error handling
    case instead of 0, as done elsewhere in this function.

    Fixes: b7da53cd6cd1 ("qtnfmac_pcie: use single PCIe driver for all platforms")
    Reported-by: Hulk Robot <hulkci@huawei.com>
    Signed-off-by: Wang Hai <wanghai38@huawei.com>
    Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    Link: https://lore.kernel.org/r/20201114123347.29632-1-wanghai38@huawei.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c b/drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c
    index 4824be0c6231e..2b8db3f73d00b 100644
    --- a/drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c
    +++ b/drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c
    @@ -299,19 +299,19 @@ static int qtnf_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id)
    sysctl_bar = qtnf_map_bar(pdev, QTN_SYSCTL_BAR);
    if (IS_ERR(sysctl_bar)) {
    pr_err("failed to map BAR%u\n", QTN_SYSCTL_BAR);
    - return ret;
    + return PTR_ERR(sysctl_bar);
    }

    dmareg_bar = qtnf_map_bar(pdev, QTN_DMA_BAR);
    if (IS_ERR(dmareg_bar)) {
    pr_err("failed to map BAR%u\n", QTN_DMA_BAR);
    - return ret;
    + return PTR_ERR(dmareg_bar);
    }

    epmem_bar = qtnf_map_bar(pdev, QTN_SHMEM_BAR);
    if (IS_ERR(epmem_bar)) {
    pr_err("failed to map BAR%u\n", QTN_SHMEM_BAR);
    - return ret;
    + return PTR_ERR(epmem_bar);
    }

    chipid = qtnf_chip_id_get(sysctl_bar);
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 14:46    [W:4.080 / U:1.772 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site