Commit d4debbcb authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Tony Lindgren
Browse files

mmc: omap: fix broken slot switch lookup 



The lookup is done before host->dev is initialized. It will always just
fail silently, and the MMC behaviour is totally unpredictable as the switch
is left in an undefined state. Fix that.

Fixes: e519f0bb ("ARM/mmc: Convert old mmci-omap to GPIO descriptors")
Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Message-ID: <20240223181439.1099750-4-aaro.koskinen@iki.fi>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 480d44d0

drivers/mmc/host/omap.c

+6 −7
Original line number Diff line number Diff line
@@ -1384,13 +1384,6 @@ static int mmc_omap_probe(struct platform_device *pdev) 
	if (IS_ERR(host->virt_base))

		return PTR_ERR(host->virt_base);



	host->slot_switch = gpiod_get_optional(host->dev, "switch",

					       GPIOD_OUT_LOW);

	if (IS_ERR(host->slot_switch))

		return dev_err_probe(host->dev, PTR_ERR(host->slot_switch),

				     "error looking up slot switch GPIO\n");





	INIT_WORK(&host->slot_release_work, mmc_omap_slot_release_work);

	INIT_WORK(&host->send_stop_work, mmc_omap_send_stop_work);
@@ -1409,6 +1402,12 @@ static int mmc_omap_probe(struct platform_device *pdev) 
	host->dev = &pdev->dev;

	platform_set_drvdata(pdev, host);



	host->slot_switch = gpiod_get_optional(host->dev, "switch",

					       GPIOD_OUT_LOW);

	if (IS_ERR(host->slot_switch))

		return dev_err_probe(host->dev, PTR_ERR(host->slot_switch),

				     "error looking up slot switch GPIO\n");



	host->id = pdev->id;

	host->irq = irq;

	host->phys_base = res->start;