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

Commit 4c5bb2e4 authored by Marek Vasut's avatar Marek Vasut Committed by Chris Ball
Browse files

mmc: mxs-mmc: Fix merge issue causing build error 



The following error appeared due to a merge problem; the patches:

fc108d24 "mmc: mxs-mmc: fix deadlock caused by recursion loop"
829c1bf4 "mmc: spi: Pull out parts shared between MMC and SPI"

came in through separate branches and cause this build error when
combined.

drivers/mmc/host/mxs-mmc.c: In function 'mxs_mmc_enable_sdio_irq':
drivers/mmc/host/mxs-mmc.c:527:3: error: 'struct mxs_mmc_host' has no member named 'base'
drivers/mmc/host/mxs-mmc.c:527:3: error: 'struct mxs_mmc_host' has no member named 'devid'
make[3]: *** [drivers/mmc/host/mxs-mmc.o] Error 1

This patch corrects the issue.

Signed-off-by: default avatarMarek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 12250d84

drivers/mmc/host/mxs-mmc.c

+1 −1
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ static void mxs_mmc_enable_sdio_irq(struct mmc_host *mmc, int enable) 
		writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK,

		       ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_SET);

		writel(BM_SSP_CTRL1_SDIO_IRQ_EN,

		       host->base + HW_SSP_CTRL1(host) + STMP_OFFSET_REG_SET);

		       ssp->base + HW_SSP_CTRL1(ssp) + STMP_OFFSET_REG_SET);

	} else {

		writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK,

		       ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_CLR);