summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Ossman <drzeus@drzeus.cx>2007-02-02 22:41:41 +0100
committerPierre Ossman <drzeus@drzeus.cx>2007-02-04 20:54:12 +0100
commitc70840e819acdbab96b8cdf71d27cb68c6567efa (patch)
tree1ee66cc38b1822da6a67498b15d5654e3efb41bc
parent2a22b14edfdf1dce303ec48bb934a6a2edb278b5 (diff)
downloadop-kernel-dev-c70840e819acdbab96b8cdf71d27cb68c6567efa.zip
op-kernel-dev-c70840e819acdbab96b8cdf71d27cb68c6567efa.tar.gz
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>
-rw-r--r--drivers/mmc/sdhci.c4
1 files changed, 2 insertions, 2 deletions
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 @@ static int __devinit sdhci_probe_slot(struct pci_dev *pdev, int slot)
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)) {
OpenPOWER on IntegriCloud