Commit 649b50a8 authored by Ruslan Piasetskyi's avatar Ruslan Piasetskyi Committed by Ulf Hansson
Browse files

mmc: renesas_sdhi: Fix error handling in renesas_sdhi_probe 



After moving tmio_mmc_host_probe down, error handling has to be
adjusted.

Fixes: 74f45de3 ("mmc: renesas_sdhi: register irqs before registering controller")
Reviewed-by: default avatarIhar Salauyou <salauyou.ihar@gmail.com>
Signed-off-by: default avatarRuslan Piasetskyi <ruslan.piasetskyi@gmail.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Tested-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20250326220638.460083-1-ruslan.piasetskyi@gmail.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 0af2f6be

drivers/mmc/host/renesas_sdhi_core.c

+4 −6
Original line number Diff line number Diff line
@@ -1243,26 +1243,26 @@ int renesas_sdhi_probe(struct platform_device *pdev, 
	num_irqs = platform_irq_count(pdev);

	if (num_irqs < 0) {

		ret = num_irqs;

		goto eirq;

		goto edisclk;

	}



	/* There must be at least one IRQ source */

	if (!num_irqs) {

		ret = -ENXIO;

		goto eirq;

		goto edisclk;

	}



	for (i = 0; i < num_irqs; i++) {

		irq = platform_get_irq(pdev, i);

		if (irq < 0) {

			ret = irq;

			goto eirq;

			goto edisclk;

		}



		ret = devm_request_irq(&pdev->dev, irq, tmio_mmc_irq, 0,

				       dev_name(&pdev->dev), host);

		if (ret)

			goto eirq;

			goto edisclk;

	}



	ret = tmio_mmc_host_probe(host);
@@ -1274,8 +1274,6 @@ int renesas_sdhi_probe(struct platform_device *pdev, 


	return ret;



eirq:

	tmio_mmc_host_remove(host);

edisclk:

	renesas_sdhi_clk_disable(host);

efree: