Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>

authored by

Marek Vasut and committed by
Chris Ball
4c5bb2e4 12250d84

+1 -1
+1 -1
drivers/mmc/host/mxs-mmc.c
··· 525 525 writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK, 526 526 ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_SET); 527 527 writel(BM_SSP_CTRL1_SDIO_IRQ_EN, 528 - host->base + HW_SSP_CTRL1(host) + STMP_OFFSET_REG_SET); 528 + ssp->base + HW_SSP_CTRL1(ssp) + STMP_OFFSET_REG_SET); 529 529 } else { 530 530 writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK, 531 531 ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_CLR);