From 44fd1917314e9d4f53dd95dd65df1c152f503d3a Mon Sep 17 00:00:00 2001

From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

Date: Wed, 15 Jun 2022 07:33:44 +0200

Subject: [PATCH] misc: rtsx: Fix an error handling path in rtsx_pci_probe()

Git-commit: 44fd1917314e9d4f53dd95dd65df1c152f503d3a

Patch-mainline: v6.0-rc1

References: git-fixes

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: ada8a8a13b13 ("mfd: Add realtek pcie card reader driver")

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

Link: https://lore.kernel.org/r/e8dc41716cbf52fb37a12e70d8972848e69df6d6.1655271216.git.christophe.jaillet@wanadoo.fr

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/misc/cardreader/rtsx_pcr.c |    6 +++++-

 1 file changed, 5 insertions(+), 1 deletion(-)

--- a/drivers/misc/cardreader/rtsx_pcr.c

+++ b/drivers/misc/cardreader/rtsx_pcr.c

@@ -1485,7 +1485,7 @@ static int rtsx_pci_probe(struct pci_dev

 	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 @@ disable_msi:

 			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: