From e526003b55ab32196ad4c1ce47d5edbfbd1b8405 Mon Sep 17 00:00:00 2001 From: Dong Aisheng Date: Wed, 30 Oct 2013 22:09:51 +0800 Subject: [PATCH] mmc: sdhci-esdhc-imx: fix cpas over write issue We should use '|=' instead '=', or it may over write the original caps assigned before this line. Signed-off-by: Dong Aisheng Acked-by: Shawn Guo Signed-off-by: Chris Ball --- drivers/mmc/host/sdhci-esdhc-imx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index 2be77e0dcc4e..fc32367c148c 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -1069,7 +1069,7 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) break; case ESDHC_CD_PERMANENT: - host->mmc->caps = MMC_CAP_NONREMOVABLE; + host->mmc->caps |= MMC_CAP_NONREMOVABLE; break; case ESDHC_CD_NONE: -- 2.20.1