From e2ce497a9d6f283575f84ff71d6dd1eda5f076a7 Mon Sep 17 00:00:00 2001 From: "Bao D. Nguyen" Date: Wed, 14 Jun 2017 12:42:41 -0700 Subject: [PATCH] mmc: sdhci-msm: Corrected the '&' operator with '&&' in the 'if' statement Without this fix the MMC may incorrectly set the CAPS for the SD card. Change-Id: Ia4be2e78453663818cfd18deb9a590ec80423bca Signed-off-by: Bao D. Nguyen --- drivers/mmc/host/sdhci-msm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index 1eeab7db9722..288d79f4defb 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -1823,7 +1823,7 @@ struct sdhci_msm_pltfm_data *sdhci_msm_populate_pdata(struct device *dev, } pdata->status_gpio = of_get_named_gpio_flags(np, "cd-gpios", 0, &flags); - if (gpio_is_valid(pdata->status_gpio) & !(flags & OF_GPIO_ACTIVE_LOW)) + if (gpio_is_valid(pdata->status_gpio) && !(flags & OF_GPIO_ACTIVE_LOW)) pdata->caps2 |= MMC_CAP2_CD_ACTIVE_HIGH; of_property_read_u32(np, "qcom,bus-width", &bus_width);