diff mbox

ARM: mmc: fix NONREMOVABLE test in sdhci-bcm-kona

Message ID 1375901981-1495-1-git-send-email-csd@broadcom.com (mailing list archive)
State New, archived
Headers show

Commit Message

Christian Daudt Aug. 7, 2013, 6:59 p.m. UTC 
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>

Comments

Christian Daudt Aug. 19, 2013, 11:30 p.m. UTC | #1 
On 13-08-07 11:59 AM, Christian Daudt wrote:
> 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>
>
> diff --git a/drivers/mmc/host/sdhci-bcm-kona.c b/drivers/mmc/host/sdhci-bcm-kona.c
> index 87175f9..9ffac0b 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,
applied to bcm/for-3.12/soc

  thanks,
    csd
diff mbox

Patch

diff --git a/drivers/mmc/host/sdhci-bcm-kona.c b/drivers/mmc/host/sdhci-bcm-kona.c
index 87175f9..9ffac0b 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,