 +		else
 +			host->mmc->ocr_avail = ocr_mask;
 +
-+		if (host->pdata && host->pdata->ocr_mask && host->mmc->ocr_avail)
++		if (host->pdata &&
++			host->pdata->ocr_mask &&
++			host->mmc->ocr_avail)
  			dev_warn(mmc_dev(host->mmc),
  				"ocr_mask/setpower will not be used\n");
  	}

Upstream-Status: Submitted
https://patchwork.kernel.org/patch/1875561/
---
 drivers/mmc/host/pxamci.c |   37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c
index 2b2f65a..6ec1566 100644
--- a/drivers/mmc/host/pxamci.c
+++ b/drivers/mmc/host/pxamci.c
@@ -83,18 +83,24 @@ struct pxamci_host {
 static inline void pxamci_init_ocr(struct pxamci_host *host)
 {
 #ifdef CONFIG_REGULATOR

+			return 0;
+		else
+			dev_warn(mmc_dev(host->mmc),
+			 "mmc_regulator_set_ocr failed, "
+			 "falling back to platform data\n");
 	}
-	if (!host->vcc && host->pdata &&
+#endif
