From: Pierre Ossman Date: Fri, 2 Feb 2007 21:41:41 +0000 (+0100) Subject: mmc: sdhci: fix voltage ocr X-Git-Tag: v2.6.21-rc2~42^2~20^2~1 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c70840e819acdbab96b8cdf71d27cb68c6567efa;p=linux-2.6-omap-h63xx.git 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 --- diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index 24803538570..4bf1fea5e2c 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)) {