summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAdrian Hunter <adrian.hunter@intel.com>2014-11-06 15:19:04 +0200
committerUlf Hansson <ulf.hansson@linaro.org>2014-11-26 14:30:51 +0100
commit4bb74313b3549f5c0c28c4652cae2cee1c2b9c95 (patch)
tree85b0359daa326667aef916bf06033c5a62bc91ed /drivers
parent04834a78bd2b40dbd8396382210db8707aecf281 (diff)
downloadlinux-4bb74313b3549f5c0c28c4652cae2cee1c2b9c95.tar.bz2
mmc: sdhci: Fix vqmmc error setting
supply.vqmmc is used with the IS_ERR macro which means the value must be valid or an error code. NULL is neither, so replace with ERR_PTR(-EINVAL). Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/host/sdhci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index a743d5227eda..c2f4754a28b6 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -3096,7 +3096,7 @@ int sdhci_add_host(struct sdhci_host *host)
if (ret) {
pr_warn("%s: Failed to enable vqmmc regulator: %d\n",
mmc_hostname(mmc), ret);
- mmc->supply.vqmmc = NULL;
+ mmc->supply.vqmmc = ERR_PTR(-EINVAL);
}
}