Skip to content

Commit

Permalink
ARM: mmc: fix NONREMOVABLE test in sdhci-bcm-kona
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Christian Daudt committed Aug 19, 2013
1 parent 959faee commit cf68b62
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/mmc/host/sdhci-bcm-kona.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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,
Expand Down

0 comments on commit cf68b62

Please sign in to comment.