AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

memstick: r592: Fix error return in r592_probe()

Browse Source 
[ Upstream commit db29d3d1c2451e673e29c7257471e3ce9d50383a ]

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:
Jing Xiangfeng 2020-11-25 09:47:18 +08:00 committed by Greg Kroah-Hartman
parent 28cb1d639e
commit db4a90026e
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/memstick/host/r592.c
View File

@ -759,8 +759,10 @@ static int r592_probe(struct pci_dev *pdev, const struct pci_device_id *id)
goto error3; goto error3;
dev->mmio = pci_ioremap_bar(pdev, 0); dev->mmio = pci_ioremap_bar(pdev, 0);
if (!dev->mmio) if (!dev->mmio) {
error = -ENOMEM;
goto error4; goto error4;
}
dev->irq = pdev->irq; dev->irq = pdev->irq;
spin_lock_init(&dev->irq_lock); 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); &dev->dummy_dma_page_physical_address, GFP_KERNEL);
r592_stop_dma(dev , 0); r592_stop_dma(dev , 0);
if (request_irq(dev->irq, &r592_irq, IRQF_SHARED, error = request_irq(dev->irq, &r592_irq, IRQF_SHARED,
DRV_NAME, dev)) DRV_NAME, dev);
if (error)
goto error6; goto error6;
r592_update_card_detect(dev); r592_update_card_detect(dev);
if (memstick_add_host(host)) error = memstick_add_host(host);
if (error)
goto error7; goto error7;
message("driver successfully loaded"); message("driver successfully loaded");