Commit 40e46f88 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: Merge branch fixes into next 



Merge the mmc fixes for v6.4-rc[n] into the next branch, to allow them to
get tested together with the new mmc changes that are targeted for v6.5.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parents 4711c6ab 413db499

drivers/mmc/host/bcm2835.c

+2 −2
Original line number Diff line number Diff line
@@ -1403,8 +1403,8 @@ static int bcm2835_probe(struct platform_device *pdev) 
	host->max_clk = clk_get_rate(clk);



	host->irq = platform_get_irq(pdev, 0);

	if (host->irq <= 0) {

		ret = -EINVAL;

	if (host->irq < 0) {

		ret = host->irq;

		goto err;

	}

drivers/mmc/host/litex_mmc.c

+1 −0
Original line number Diff line number Diff line
@@ -649,6 +649,7 @@ static struct platform_driver litex_mmc_driver = { 
	.driver = {

		.name = "litex-mmc",

		.of_match_table = litex_match,

		.probe_type = PROBE_PREFER_ASYNCHRONOUS,

	},

};

module_platform_driver(litex_mmc_driver);

drivers/mmc/host/meson-gx-mmc.c

+2 −2
Original line number Diff line number Diff line
@@ -1186,8 +1186,8 @@ static int meson_mmc_probe(struct platform_device *pdev) 
		return PTR_ERR(host->regs);



	host->irq = platform_get_irq(pdev, 0);

	if (host->irq <= 0)

		return -EINVAL;

	if (host->irq < 0)

		return host->irq;



	cd_irq = platform_get_irq_optional(pdev, 1);

	mmc_gpio_set_cd_irq(mmc, cd_irq);

drivers/mmc/host/mtk-sd.c

+1 −1
Original line number Diff line number Diff line
@@ -2724,7 +2724,7 @@ static int msdc_drv_probe(struct platform_device *pdev) 


	host->irq = platform_get_irq(pdev, 0);

	if (host->irq < 0) {

		ret = -EINVAL;

		ret = host->irq;

		goto host_free;

	}

drivers/mmc/host/mvsdio.c

+1 −1
Original line number Diff line number Diff line
@@ -704,7 +704,7 @@ static int mvsd_probe(struct platform_device *pdev) 
	}

	irq = platform_get_irq(pdev, 0);

	if (irq < 0)

		return -ENXIO;

		return irq;



	mmc = mmc_alloc_host(sizeof(struct mvsd_host), &pdev->dev);

	if (!mmc) {