---

yaml --- r: 273399 b: refs/heads/master c: 4a2a734 h: refs/heads/master i: 273397: d63575e 273395: c5779da 273391: eb0cea7 v: v3
git-mirror · Oct 24, 2011 · 6047724 · 6047724
1 parent 618da7a
commit 6047724
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a980bf73ba8ff76e6fab0644513c1127d852d0a8
+refs/heads/master: 4a2a734306a6e3cc7766d2117ec142de9262f217
diff --git a/trunk/drivers/mfd/mc13xxx-core.c b/trunk/drivers/mfd/mc13xxx-core.c
@@ -750,10 +750,8 @@ static int mc13xxx_probe(struct spi_device *spi)
 	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");