diff options
author | Mark Brown <broonie@linaro.org> | 2013-07-29 16:55:40 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-07-31 04:56:41 -0400 |
commit | 6ae8717a4897d776097c5c2578a907d3c59b1e9f (patch) | |
tree | ba75f9657bab8fa4b6e409c5973e0fd666c56649 | |
parent | a55d6ff0ed169fe2cf4bcdd81049c3c2041a7465 (diff) |
mmc: pxamci: Indicate that regulators may be absent
Use regulator_get_optional() to tell the core that requests for regulators
can fail in a real system.
Signed-off-by: Mark Brown <broonie@linaro.org>
Acked-by: Chris Ball <cjb@laptop.org>
-rw-r--r-- | drivers/mmc/host/pxamci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c index 2c5a91bb8ec3..1956a3df7cf3 100644 --- a/drivers/mmc/host/pxamci.c +++ b/drivers/mmc/host/pxamci.c | |||
@@ -83,7 +83,7 @@ struct pxamci_host { | |||
83 | static inline void pxamci_init_ocr(struct pxamci_host *host) | 83 | static inline void pxamci_init_ocr(struct pxamci_host *host) |
84 | { | 84 | { |
85 | #ifdef CONFIG_REGULATOR | 85 | #ifdef CONFIG_REGULATOR |
86 | host->vcc = regulator_get(mmc_dev(host->mmc), "vmmc"); | 86 | host->vcc = regulator_get_optional(mmc_dev(host->mmc), "vmmc"); |
87 | 87 | ||
88 | if (IS_ERR(host->vcc)) | 88 | if (IS_ERR(host->vcc)) |
89 | host->vcc = NULL; | 89 | host->vcc = NULL; |