diff options
| author | Dong Aisheng <b29396@freescale.com> | 2013-10-30 22:09:51 +0800 |
|---|---|---|
| committer | Chris Ball <chris@printf.net> | 2014-01-13 12:48:02 -0500 |
| commit | e526003b55ab32196ad4c1ce47d5edbfbd1b8405 (patch) | |
| tree | ade7a5a48a19819f2d0938875b756118485980a7 /drivers/mmc/host | |
| parent | 7dd109ef4f58ca09c18809e981658ffeaca471f8 (diff) | |
| download | linux-e526003b55ab32196ad4c1ce47d5edbfbd1b8405.tar.gz linux-e526003b55ab32196ad4c1ce47d5edbfbd1b8405.tar.bz2 linux-e526003b55ab32196ad4c1ce47d5edbfbd1b8405.zip | |
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 <b29396@freescale.com>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/host')
| -rw-r--r-- | drivers/mmc/host/sdhci-esdhc-imx.c | 2 |
1 files changed, 1 insertions, 1 deletions
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: |