mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-13 22:25:03 +00:00
memstick: r592: Fix error return in r592_probe()
[ Upstream commitdb29d3d1c2
] Fix to return a error code from the error handling case instead of 0. Fixes:9263412501
("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>
This commit is contained in:
parent
e39b37d6a2
commit
33eeb39551
1 changed files with 8 additions and 4 deletions
|
@ -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");
|
||||
|
|
Loading…
Reference in a new issue