summaryrefslogtreecommitdiff
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-10-24 14:11:34 +0400
committerMark Brown <broonie@linaro.org>2013-10-24 14:11:34 +0400
commit513b485a2d87779ddca0bfe8dc69691f62803873 (patch)
treef2ae2b6f9f25524f3319bf97a11d9fd63eabe3f4 /drivers/regulator
parent2a86e8e753766f2b3e615c0a885e72293b6fca84 (diff)
parent0fdfd40aca7046eb0b770d64dfe526a03ed5d092 (diff)
downloadlinux-513b485a2d87779ddca0bfe8dc69691f62803873.tar.xz
Merge remote-tracking branch 'regulator/topic/da9063' into regulator-next
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/da9063-regulator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/da9063-regulator.c b/drivers/regulator/da9063-regulator.c
index b9f2653e4ef9..3d910f4f3a0e 100644
--- a/drivers/regulator/da9063-regulator.c
+++ b/drivers/regulator/da9063-regulator.c
@@ -717,7 +717,7 @@ static int da9063_regulator_probe(struct platform_device *pdev)
{
struct da9063 *da9063 = dev_get_drvdata(pdev->dev.parent);
struct da9063_pdata *da9063_pdata = dev_get_platdata(da9063->dev);
- struct of_regulator_match *da9063_reg_matches;
+ struct of_regulator_match *da9063_reg_matches = NULL;
struct da9063_regulators_pdata *regl_pdata;
const struct da9063_dev_model *model;
struct da9063_regulators *regulators;