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

Commit be8f7c44 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Greg Kroah-Hartman
Browse files

misc: rtsx: Fix an error handling path in rtsx_pci_probe() 



[ Upstream commit 44fd1917314e9d4f53dd95dd65df1c152f503d3a ]

If an error occurs after a successful idr_alloc() call, the corresponding
resource must be released with idr_remove() as already done in the .remove
function.

Update the error handling path to add the missing idr_remove() call.

Fixes: ada8a8a1 ("mfd: Add realtek pcie card reader driver")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/e8dc41716cbf52fb37a12e70d8972848e69df6d6.1655271216.git.christophe.jaillet@wanadoo.fr


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 507cabdb

drivers/misc/cardreader/rtsx_pcr.c

+5 −1
Original line number Diff line number Diff line
@@ -1485,7 +1485,7 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, 
	pcr->remap_addr = ioremap_nocache(base, len);

	if (!pcr->remap_addr) {

		ret = -ENOMEM;

		goto free_handle;

		goto free_idr;

	}



	pcr->rtsx_resv_buf = dma_alloc_coherent(&(pcidev->dev),
@@ -1547,6 +1547,10 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, 
			pcr->rtsx_resv_buf, pcr->rtsx_resv_buf_addr);

unmap:

	iounmap(pcr->remap_addr);

free_idr:

	spin_lock(&rtsx_pci_lock);

	idr_remove(&rtsx_pci_idr, pcr->id);

	spin_unlock(&rtsx_pci_lock);

free_handle:

	kfree(handle);

free_pcr: