Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e89971af authored by Jing Xiangfeng's avatar Jing Xiangfeng Committed by Greg Kroah-Hartman
Browse files

memstick: r592: Fix error return in r592_probe() 



[ Upstream commit db29d3d1c2451e673e29c7257471e3ce9d50383a ]

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

Fixes: 92634125 ("memstick: add driver for Ricoh R5C592 card reader")
Signed-off-by: default avatarJing Xiangfeng <jingxiangfeng@huawei.com>
Link: https://lore.kernel.org/r/20201125014718.153563-1-jingxiangfeng@huawei.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 59e0eaaa

drivers/memstick/host/r592.c

+8 −4
Original line number Diff line number Diff line
@@ -762,8 +762,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);
@@ -790,12 +792,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");