diff options
| author | Christian Daudt <csd@broadcom.com> | 2013-08-07 11:59:41 -0700 |
|---|---|---|
| committer | Matt Porter <matt.porter@linaro.org> | 2013-08-08 10:42:03 -0400 |
| commit | d08a779bf4a12876c00a2470766565252c41b70e (patch) | |
| tree | c55c42648d5cceff3a214cdef2a1899093fdaa90 | |
| parent | c095ba7224d8edc71dcef0d655911399a8bd4a3f (diff) | |
ARM: mmc: fix NONREMOVABLE test in sdhci-bcm-konareview/mmc-sdhci-bcm-kona-fix-nonremovable-test-v1
sdhci-bcm-kona driver is incorrectly doing "|" to bit-test
NONREMOVABLE. Switch to "&"
Reviewed-by: Markus Mayer <markus.mayer@linaro.org>
Reviewed-by: Matt Porter <matt.porter@linaro.org>
Signed-off-by: Christian Daudt <csd@broadcom.com>
| -rw-r--r-- | drivers/mmc/host/sdhci-bcm-kona.c | 4 |
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 87175f9817c..9ffac0ba9f0 100644 --- a/drivers/mmc/host/sdhci-bcm-kona.c +++ b/drivers/mmc/host/sdhci-bcm-kona.c @@ -263,7 +263,7 @@ static int __init 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 __init 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, |