diff options
| author | Dong Aisheng <b29396@freescale.com> | 2013-10-17 14:29:32 +0800 |
|---|---|---|
| committer | Dong Aisheng <b29396@freescale.com> | 2013-11-08 10:50:31 +0800 |
| commit | b6d8e88c0ee8f23452386a9642a341f871e432f3 (patch) | |
| tree | 9340a074819c022093f886eed1e72a98cd159994 /drivers/mmc/host/sdhci-esdhc-imx.c | |
| parent | 8195113a43012ff46ed931746a719d0168a858f5 (diff) | |
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>
Diffstat (limited to 'drivers/mmc/host/sdhci-esdhc-imx.c')
| -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 0b5289d23a6c..39b7db009199 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -1094,7 +1094,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: |