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.10 300/717] memstick: r592: Fix error return in r592_probe()
    Date
    From: Jing Xiangfeng <jingxiangfeng@huawei.com>

    [ Upstream commit db29d3d1c2451e673e29c7257471e3ce9d50383a ]

    Fix to return a error code from the error handling case instead of 0.

    Fixes: 926341250102 ("memstick: add driver for Ricoh R5C592 card reader")
    Signed-off-by: Jing Xiangfeng <jingxiangfeng@huawei.com>
    Link: https://lore.kernel.org/r/20201125014718.153563-1-jingxiangfeng@huawei.com
    Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/memstick/host/r592.c | 12 ++++++++----
    1 file changed, 8 insertions(+), 4 deletions(-)

    diff --git a/drivers/memstick/host/r592.c b/drivers/memstick/host/r592.c
    index dd3a1f3dcc191..d2ef46337191c 100644
    --- a/drivers/memstick/host/r592.c
    +++ b/drivers/memstick/host/r592.c
    @@ -759,8 +759,10 @@ static int r592_probe(struct pci_dev *pdev, const struct pci_device_id *id)
    goto error3;

    dev->mmio = pci_ioremap_bar(pdev, 0);
    - if (!dev->mmio)
    + if (!dev->mmio) {
    + error = -ENOMEM;
    goto error4;
    + }

    dev->irq = pdev->irq;
    spin_lock_init(&dev->irq_lock);
    @@ -786,12 +788,14 @@ static int r592_probe(struct pci_dev *pdev, const struct pci_device_id *id)
    &dev->dummy_dma_page_physical_address, GFP_KERNEL);
    r592_stop_dma(dev , 0);

    - if (request_irq(dev->irq, &r592_irq, IRQF_SHARED,
    - DRV_NAME, dev))
    + error = request_irq(dev->irq, &r592_irq, IRQF_SHARED,
    + DRV_NAME, dev);
    + if (error)
    goto error6;

    r592_update_card_detect(dev);
    - if (memstick_add_host(host))
    + error = memstick_add_host(host);
    + if (error)
    goto error7;

    message("driver successfully loaded");
    --
    2.27.0


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