summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-02-19 13:42:31 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-02-19 13:42:31 +0100
commit20ab4a7a792bc9cc4a71c945a81743be96a12126 (patch)
tree103ce8e8eb437cd99be972992be6c836161c39ae /drivers
parentMerge remote-tracking branch 'regulator/topic/arizona' into regulator-next (diff)
parentregulator: as3711: Fix checking if no platform initialization data (diff)
downloadlinux-20ab4a7a792bc9cc4a71c945a81743be96a12126.tar.xz
linux-20ab4a7a792bc9cc4a71c945a81743be96a12126.zip
Merge remote-tracking branch 'regulator/topic/as3711' into regulator-next
Diffstat (limited to 'drivers')
-rw-r--r--drivers/regulator/as3711-regulator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/as3711-regulator.c b/drivers/regulator/as3711-regulator.c
index 2f1341db38a0..f0ba8c4eefa9 100644
--- a/drivers/regulator/as3711-regulator.c
+++ b/drivers/regulator/as3711-regulator.c
@@ -303,7 +303,7 @@ static int as3711_regulator_probe(struct platform_device *pdev)
reg_data = pdata ? pdata->init_data[id] : NULL;
/* No need to register if there is no regulator data */
- if (!ri->desc.name)
+ if (!reg_data)
continue;
reg = &regs[id];