Skip to content

Commit 649b50a

Browse files
rpiasetskyistorulf
authored andcommitted
mmc: renesas_sdhi: Fix error handling in renesas_sdhi_probe
After moving tmio_mmc_host_probe down, error handling has to be adjusted. Fixes: 74f45de ("mmc: renesas_sdhi: register irqs before registering controller") Reviewed-by: Ihar Salauyou <salauyou.ihar@gmail.com> Signed-off-by: Ruslan Piasetskyi <ruslan.piasetskyi@gmail.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Tested-by: Wolfram 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: Ulf Hansson <ulf.hansson@linaro.org>
1 parent 0af2f6b commit 649b50a

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

drivers/mmc/host/renesas_sdhi_core.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1243,26 +1243,26 @@ int renesas_sdhi_probe(struct platform_device *pdev,
12431243
num_irqs = platform_irq_count(pdev);
12441244
if (num_irqs < 0) {
12451245
ret = num_irqs;
1246-
goto eirq;
1246+
goto edisclk;
12471247
}
12481248

12491249
/* There must be at least one IRQ source */
12501250
if (!num_irqs) {
12511251
ret = -ENXIO;
1252-
goto eirq;
1252+
goto edisclk;
12531253
}
12541254

12551255
for (i = 0; i < num_irqs; i++) {
12561256
irq = platform_get_irq(pdev, i);
12571257
if (irq < 0) {
12581258
ret = irq;
1259-
goto eirq;
1259+
goto edisclk;
12601260
}
12611261

12621262
ret = devm_request_irq(&pdev->dev, irq, tmio_mmc_irq, 0,
12631263
dev_name(&pdev->dev), host);
12641264
if (ret)
1265-
goto eirq;
1265+
goto edisclk;
12661266
}
12671267

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

12751275
return ret;
12761276

1277-
eirq:
1278-
tmio_mmc_host_remove(host);
12791277
edisclk:
12801278
renesas_sdhi_clk_disable(host);
12811279
efree:

0 commit comments

Comments
 (0)