projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7dd109e)
mmc: sdhci-esdhc-imx: fix cpas over write issue
authorDong Aisheng <b29396@freescale.com>
Wed, 30 Oct 2013 14:09:51 +0000 (22:09 +0800)
committerChris Ball <chris@printf.net>
Mon, 13 Jan 2014 17:48:02 +0000 (12:48 -0500)
We should use '|=' instead '=', or it may over write the original
caps assigned before this line.

Signed-off-by: Dong Aisheng <b29396@freescale.com>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
drivers/mmc/host/sdhci-esdhc-imx.c patch | blob | blame | history

diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index 2be77e0dcc4ea35fd64886aecbf1d01ed9b55017..fc32367c148c1ba849f6aa30e0df3310dd5d5ee7 100644 (file)
--- 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: