UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Christian Daudt 2013-08-02 15:32:27 -07:00
parent 959faee9e1
commit cf68b629f9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/mmc/host/sdhci-bcm-kona.c
View File

@ -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_cd(host->mmc) != -ENOSYS) ? 'Y' : 'N',
(mmc_gpio_get_ro(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; host->quirks |= SDHCI_QUIRK_BROKEN_CARD_DETECTION;
dev_dbg(dev, "is_8bit=%c\n", 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 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); ret = sdhci_bcm_kona_sd_card_emulate(host, 1);
if (ret) { if (ret) {
dev_err(dev, dev_err(dev,