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

Commit 5b1cf777 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mmc: sdhci-msm: Corrected the '&' operator with '&&' in the 'if' statement"

parents 93b52204 e2ce497a

drivers/mmc/host/sdhci-msm.c

+1 −1
Original line number Diff line number Diff line
@@ -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);