lkml.org 
[lkml]   [2020]   [Dec]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH] memstick: r592: Fix error return in r592_probe()
On Wed, 25 Nov 2020 at 02:43, Jing Xiangfeng <jingxiangfeng@huawei.com> wrote:
>
> 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>

Applied for next, thanks!

Kind regards
Uffe


> ---
> 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 dd3a1f3dcc19..d2ef46337191 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.22.0
>

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