From: b29396@freescale.com (Dong Aisheng)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 4/6] mmc: sdhci-esdhc-imx: fix cpas over write issue
Date: Wed, 30 Oct 2013 22:09:51 +0800 [thread overview]
Message-ID: <1383142193-24950-5-git-send-email-b29396@freescale.com> (raw)
In-Reply-To: <1383142193-24950-1-git-send-email-b29396@freescale.com>
We should use '|=' instead '=', or it may over write
the original caps assigned before this line.
Signed-off-by: Dong Aisheng <b29396@freescale.com>
---
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 92d5782..b2acb75 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:
--
1.7.2.rc3
next prev parent reply other threads:[~2013-10-30 14:09 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-30 14:09 [PATCH v2 0/6] mmc: sdhci-esdhc-imx: fix acmd23 unwork and ddr not supported on sabresd issues Dong Aisheng
2013-10-30 14:09 ` [PATCH v2 1/6] mmc: sdhci: clear auto cmd setting bits for no data cmds Dong Aisheng
2013-11-19 11:52 ` Fabio Estevam
2013-10-30 14:09 ` [PATCH v2 2/6] mmc: sdhci-esdhc-imx: add SDHCI_TRANSFER_MODE read function Dong Aisheng
2013-10-30 14:09 ` [PATCH v2 3/6] ARM: dts: sabresd: add usdhc4 support Dong Aisheng
2013-10-30 14:09 ` Dong Aisheng [this message]
2013-10-30 14:09 ` [PATCH v2 5/6] mmc: sdhci-esdhc-imx: add MMC_CAP_1_8V_DDR for mx6 Dong Aisheng
2013-10-30 14:09 ` [PATCH v2 6/6] mmc: core: mmc DDR mode should not depend on UHS_DDR50 Dong Aisheng
2013-10-30 22:36 ` Ulf Hansson
2013-10-31 7:04 ` [PATCH v2 0/6] mmc: sdhci-esdhc-imx: fix acmd23 unwork and ddr not supported on sabresd issues Shawn Guo
2013-11-13 11:16 ` Dong Aisheng
2013-11-26 21:37 ` Chris Ball
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1383142193-24950-5-git-send-email-b29396@freescale.com \
--to=b29396@freescale.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).