diff options
author | Christian Daudt <csd@broadcom.com> | 2013-08-02 18:32:27 -0400 |
---|---|---|
committer | Christian Daudt <csd@broadcom.com> | 2013-08-19 19:29:42 -0400 |
commit | cf68b629f938c01c9aa84fff95e1be96032af08d (patch) | |
tree | 8f4ab9afcfb6a389f5c15414ef5f5713c49b0fdd /drivers/mmc | |
parent | 959faee9e1e26674f707bc9b2d993ea551422d22 (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')
-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 34fd65294d5f..90a936732925 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) | |||
263 | (mmc_gpio_get_cd(host->mmc) != -ENOSYS) ? 'Y' : 'N', | 263 | (mmc_gpio_get_cd(host->mmc) != -ENOSYS) ? 'Y' : 'N', |
264 | (mmc_gpio_get_ro(host->mmc) != -ENOSYS) ? 'Y' : 'N'); | 264 | (mmc_gpio_get_ro(host->mmc) != -ENOSYS) ? 'Y' : 'N'); |
265 | 265 | ||
266 | if (host->mmc->caps | MMC_CAP_NONREMOVABLE) | 266 | if (host->mmc->caps & MMC_CAP_NONREMOVABLE) |
267 | host->quirks |= SDHCI_QUIRK_BROKEN_CARD_DETECTION; | 267 | host->quirks |= SDHCI_QUIRK_BROKEN_CARD_DETECTION; |
268 | 268 | ||
269 | dev_dbg(dev, "is_8bit=%c\n", | 269 | dev_dbg(dev, "is_8bit=%c\n", |
@@ -282,7 +282,7 @@ static int sdhci_bcm_kona_probe(struct platform_device *pdev) | |||
282 | } | 282 | } |
283 | 283 | ||
284 | /* if device is eMMC, emulate card insert right here */ | 284 | /* if device is eMMC, emulate card insert right here */ |
285 | if (host->mmc->caps | MMC_CAP_NONREMOVABLE) { | 285 | if (host->mmc->caps & MMC_CAP_NONREMOVABLE) { |
286 | ret = sdhci_bcm_kona_sd_card_emulate(host, 1); | 286 | ret = sdhci_bcm_kona_sd_card_emulate(host, 1); |
287 | if (ret) { | 287 | if (ret) { |
288 | dev_err(dev, | 288 | dev_err(dev, |