summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host/sdhci-bcm-kona.c
diff options
context:
space:
mode:
authorChristian Daudt <csd@broadcom.com>2013-08-02 15:32:27 -0700
committerChristian Daudt <csd@broadcom.com>2013-08-19 16:29:42 -0700
commitcf68b629f938c01c9aa84fff95e1be96032af08d (patch)
tree8f4ab9afcfb6a389f5c15414ef5f5713c49b0fdd /drivers/mmc/host/sdhci-bcm-kona.c
parent959faee9e1e26674f707bc9b2d993ea551422d22 (diff)
ARM: mmc: fix NONREMOVABLE test in sdhci-bcm-kona
sdhci-bcm-kona driver is incorrectly doing "|" to bit-test NONREMOVABLE. Switch to "&" Signed-off-by: Christian Daudt <csd@broadcom.com> Reviewed-by: Markus Mayer <markus.mayer@linaro.org> Reviewed-by: Matt Porter <matt.porter@linaro.org>
Diffstat (limited to 'drivers/mmc/host/sdhci-bcm-kona.c')
-rw-r--r--drivers/mmc/host/sdhci-bcm-kona.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/sdhci-bcm-kona.c b/drivers/mmc/host/sdhci-bcm-kona.c
index 34fd65294d5..90a93673292 100644
--- a/drivers/mmc/host/sdhci-bcm-kona.c
+++ b/drivers/mmc/host/sdhci-bcm-kona.c
@@ -263,7 +263,7 @@ static int sdhci_bcm_kona_probe(struct platform_device *pdev)
(mmc_gpio_get_cd(host->mmc) != -ENOSYS) ? 'Y' : 'N',
(mmc_gpio_get_ro(host->mmc) != -ENOSYS) ? 'Y' : 'N');
- if (host->mmc->caps | MMC_CAP_NONREMOVABLE)
+ if (host->mmc->caps & MMC_CAP_NONREMOVABLE)
host->quirks |= SDHCI_QUIRK_BROKEN_CARD_DETECTION;
dev_dbg(dev, "is_8bit=%c\n",
@@ -282,7 +282,7 @@ static int sdhci_bcm_kona_probe(struct platform_device *pdev)
}
/* if device is eMMC, emulate card insert right here */
- if (host->mmc->caps | MMC_CAP_NONREMOVABLE) {
+ if (host->mmc->caps & MMC_CAP_NONREMOVABLE) {
ret = sdhci_bcm_kona_sd_card_emulate(host, 1);
if (ret) {
dev_err(dev,