|
@@ -345,15 +345,19 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host)
|
|
{
|
|
{
|
|
struct regulator *reg;
|
|
struct regulator *reg;
|
|
int ocr_value = 0;
|
|
int ocr_value = 0;
|
|
|
|
+ int ret;
|
|
|
|
|
|
if (mmc_pdata(host)->set_power)
|
|
if (mmc_pdata(host)->set_power)
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
- reg = devm_regulator_get(host->dev, "vmmc");
|
|
|
|
|
|
+ reg = devm_regulator_get_optional(host->dev, "vmmc");
|
|
if (IS_ERR(reg)) {
|
|
if (IS_ERR(reg)) {
|
|
- dev_err(host->dev, "unable to get vmmc regulator %ld\n",
|
|
|
|
|
|
+ ret = PTR_ERR(reg);
|
|
|
|
+ if (ret != -ENODEV)
|
|
|
|
+ return ret;
|
|
|
|
+ host->vcc = NULL;
|
|
|
|
+ dev_dbg(host->dev, "unable to get vmmc regulator %ld\n",
|
|
PTR_ERR(reg));
|
|
PTR_ERR(reg));
|
|
- return PTR_ERR(reg);
|
|
|
|
} else {
|
|
} else {
|
|
host->vcc = reg;
|
|
host->vcc = reg;
|
|
ocr_value = mmc_regulator_get_ocrmask(reg);
|
|
ocr_value = mmc_regulator_get_ocrmask(reg);
|