Skip to content

Commit

Permalink
mmc: uniphier-sd: call devm_request_irq() after tmio_mmc_host_probe()
Browse files Browse the repository at this point in the history
Currently, tmio_mmc_irq() handler is registered before the host is
fully initialized by tmio_mmc_host_probe(). I did not previously notice
this problem.

The boot ROM of a new Socionext SoC unmasks interrupts (CTL_IRQ_MASK)
somehow. The handler is invoked before tmio_mmc_host_probe(), then
emits noisy call trace.

Move devm_request_irq() below tmio_mmc_host_probe().

Fixes: 3fd784f ("mmc: uniphier-sd: add UniPhier SD/eMMC controller driver")
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20200511062158.1790924-1-yamada.masahiro@socionext.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
  • Loading branch information
masahir0y authored and storulf committed May 28, 2020
1 parent 1ae1d2d commit 5d1f42e
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions drivers/mmc/host/uniphier-sd.c
Original file line number Diff line number Diff line change
Expand Up @@ -610,11 +610,6 @@ static int uniphier_sd_probe(struct platform_device *pdev)
}
}

ret = devm_request_irq(dev, irq, tmio_mmc_irq, IRQF_SHARED,
dev_name(dev), host);
if (ret)
goto free_host;

if (priv->caps & UNIPHIER_SD_CAP_EXTENDED_IP)
host->dma_ops = &uniphier_sd_internal_dma_ops;
else
Expand Down Expand Up @@ -642,8 +637,15 @@ static int uniphier_sd_probe(struct platform_device *pdev)
if (ret)
goto free_host;

ret = devm_request_irq(dev, irq, tmio_mmc_irq, IRQF_SHARED,
dev_name(dev), host);
if (ret)
goto remove_host;

return 0;

remove_host:
tmio_mmc_host_remove(host);
free_host:
tmio_mmc_host_free(host);

Expand Down

0 comments on commit 5d1f42e

Please sign in to comment.