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

Commit 5a05406e authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Greg Kroah-Hartman
Browse files

mmc: uniphier-sd: call devm_request_irq() after tmio_mmc_host_probe() 



commit 5d1f42e14b135773c0cc1d82e904c5b223783a9d upstream.

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: 3fd784f7 ("mmc: uniphier-sd: add UniPhier SD/eMMC controller driver")
Signed-off-by: default avatarMasahiro 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: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1ccf2d6c

drivers/mmc/host/uniphier-sd.c

+7 −5
Original line number Diff line number Diff line
@@ -614,11 +614,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
@@ -646,8 +641,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);