diff options
| author |   Adrian Hunter <adrian.hunter@intel.com> | 2014-11-06 15:19:04 +0200 |
|---|---|---|
| committer |   Ulf Hansson <ulf.hansson@linaro.org> | 2014-11-26 14:30:51 +0100 |
| commit | 4bb74313b3549f5c0c28c4652cae2cee1c2b9c95 (patch) | |
| tree | 85b0359daa326667aef916bf06033c5a62bc91ed /drivers/mmc | |
| parent | mmc: sdhci: Remove unused SDHCI_CTRL_HS_SDR200 (diff) | |
| download | linux-dev-4bb74313b3549f5c0c28c4652cae2cee1c2b9c95.tar.xz linux-dev-4bb74313b3549f5c0c28c4652cae2cee1c2b9c95.zip | |
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/mmc')
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 2 |
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); } } |