diff options
| author | Bao D. Nguyen <nguyenb@codeaurora.org> | 2017-06-14 12:42:41 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-06-14 14:30:08 -0700 |
| commit | e2ce497a9d6f283575f84ff71d6dd1eda5f076a7 (patch) | |
| tree | 234c2b00e8229f2232ff404d9d15215b0ae1c8a0 | |
| parent | 959abd171bdcc8163faaaae5b58927f3f944e1b9 (diff) | |
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 <nguyenb@codeaurora.org>
| -rw-r--r-- | drivers/mmc/host/sdhci-msm.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |