-From: Marko Katic <dromede.gmail.com>
+From 04e7345a49a7ab2eb725f8ee2569c49b9ea697bb Mon Sep 17 00:00:00 2001
+From: Marko Katic <dromede@gmail.com>
+Date: Mon, 15 Jul 2013 00:55:13 +0200
+Subject: [PATCH] pxamci: Refactor regulator support
 
 Here's an interesting scenario. The spitz machine has an
 Intersil 6271A voltage regulator and an ADS7846 touchscreen

 		/* fall-back to platform data */
 		host->mmc->ocr_avail = host->pdata ?
 			host->pdata->ocr_mask :
@@ -108,26 +114,31 @@ static inline int pxamci_set_power(struct pxamci_host *host,
 {
 	int on;
 

+		else
+			host->mmc->ocr_avail = ocr_mask;
+
+		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");
 	}
