summaryrefslogtreecommitdiff
path: root/drivers/regulator
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2013-02-13 09:34:48 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-02-13 12:56:51 +0000
commit09ca50d2ade7ed6b3b2653b771774cf360c3d56c (patch)
treee0a6b7ad1f118765934edd72173db74aa2304b84 /drivers/regulator
parent836dc9e3fbbab0c30aa6e664417225f5c1fb1c39 (diff)
downloadlinux-3.10-09ca50d2ade7ed6b3b2653b771774cf360c3d56c.tar.gz
linux-3.10-09ca50d2ade7ed6b3b2653b771774cf360c3d56c.tar.bz2
linux-3.10-09ca50d2ade7ed6b3b2653b771774cf360c3d56c.zip
regulator: as3711: Fix checking if no platform initialization data
To skip registering regulator if no platform initialization data, we should check reg_data rather than ri->desc.name. Signed-off-by: Axel Lin <axel.lin@ingics.com> Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator')
-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 2f1341db38a..f0ba8c4eefa 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];