From: Philippe Rétornaz <philippe.retornaz@epfl.ch>
Date: Fri, 22 Jul 2011 14:17:07 +0000 (+0200)
Subject: mfd: Unconditionally register mc13xxx regulator subdevice
X-Git-Tag: v3.2-rc1~72^2~44
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4a2a734306a6e3cc7766d2117ec142de9262f217;p=platform%2Fkernel%2Flinux-exynos.git

mfd: Unconditionally register mc13xxx regulator subdevice

Signed-off-by: Philippe Rétornaz <philippe.retornaz@epfl.ch>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
---

diff --git a/drivers/mfd/mc13xxx-core.c b/drivers/mfd/mc13xxx-core.c
index 5f782adf..dd232ea 100644
--- a/drivers/mfd/mc13xxx-core.c
+++ b/drivers/mfd/mc13xxx-core.c
@@ -750,10 +750,8 @@ err_revision:
 	if (pdata->flags & MC13XXX_USE_CODEC)
 		mc13xxx_add_subdevice(mc13xxx, "%s-codec");
 
-	if (pdata->flags & MC13XXX_USE_REGULATOR) {
-		mc13xxx_add_subdevice_pdata(mc13xxx, "%s-regulator",
-				&pdata->regulators, sizeof(pdata->regulators));
-	}
+	mc13xxx_add_subdevice_pdata(mc13xxx, "%s-regulator",
+		&pdata->regulators, sizeof(pdata->regulators));
 
 	if (pdata->flags & MC13XXX_USE_RTC)
 		mc13xxx_add_subdevice(mc13xxx, "%s-rtc");