commit c70840e819acdbab96b8cdf71d27cb68c6567efa
author Pierre Ossman <drzeus@drzeus.cx> Fri Feb 02 22:41:41 2007 +0100
committer Pierre Ossman <drzeus@drzeus.cx> Sun Feb 04 20:54:12 2007 +0100
tree 1ee66cc38b1822da6a67498b15d5654e3efb41bc
parent 2a22b14edfdf1dce303ec48bb934a6a2edb278b5

mmc: sdhci: fix voltage ocr

Some bad if-clauses caused the driver to just report the highest
supported voltage, not all.

Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>

drivers/mmc/sdhci.c

diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index 2480353..4bf1fea 100644
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -1291,9 +1291,9 @@
 	mmc->ocr_avail = 0;
 	if (caps & SDHCI_CAN_VDD_330)
 		mmc->ocr_avail |= MMC_VDD_32_33|MMC_VDD_33_34;
-	else if (caps & SDHCI_CAN_VDD_300)
+	if (caps & SDHCI_CAN_VDD_300)
 		mmc->ocr_avail |= MMC_VDD_29_30|MMC_VDD_30_31;
-	else if (caps & SDHCI_CAN_VDD_180)
+	if (caps & SDHCI_CAN_VDD_180)
 		mmc->ocr_avail |= MMC_VDD_17_18|MMC_VDD_18_19;
 
 	if ((host->max_clk > 25000000) && !(caps & SDHCI_CAN_DO_HISPD)) {