Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf68b629 authored by Christian Daudt's avatar Christian Daudt
Browse files

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: default avatarChristian Daudt <csd@broadcom.com>
Reviewed-by: default avatarMarkus Mayer <markus.mayer@linaro.org>
Reviewed-by: default avatarMatt Porter <matt.porter@linaro.org>
parent 959faee9

drivers/mmc/host/sdhci-bcm-kona.c

+2 −2
Original line number Diff line number Diff line
@@ -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",
@@ -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,