aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorAdrian Hunter <adrian.hunter@intel.com>2015-11-26 14:00:46 +0200
committerUlf Hansson <ulf.hansson@linaro.org>2015-12-22 11:32:14 +0100
commit9d5de93f6d543b356e39e225988ef443a7bce34c (patch)
tree1012fb9833ca90f6444469ca1a350b885440f709 /drivers/mmc
parentmmc: sdhci-pci: Do not default to 33 Ohm driver strength for Intel SPT (diff)
downloadlinux-dev-9d5de93f6d543b356e39e225988ef443a7bce34c.tar.xz
linux-dev-9d5de93f6d543b356e39e225988ef443a7bce34c.zip
mmc: sdhci: Do not BUG on invalid vdd
The driver may not be able to set the power correctly but that is not a reason to BUG(). Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Reviewed-by: Venu Byravarasu <vbyravarasu@nvidia.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/sdhci.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 2b17cc1246ca..4cfb26152a58 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1299,7 +1299,9 @@ static void sdhci_set_power(struct sdhci_host *host, unsigned char mode,
pwr = SDHCI_POWER_330;
break;
default:
- BUG();
+ WARN(1, "%s: Invalid vdd %#x\n",
+ mmc_hostname(host->mmc), vdd);
+ break;
}
}