diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-24 11:11:34 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-24 11:11:34 +0100 |
| commit | 513b485a2d87779ddca0bfe8dc69691f62803873 (patch) | |
| tree | f2ae2b6f9f25524f3319bf97a11d9fd63eabe3f4 /drivers/regulator | |
| parent | 2a86e8e753766f2b3e615c0a885e72293b6fca84 (diff) | |
| parent | 0fdfd40aca7046eb0b770d64dfe526a03ed5d092 (diff) | |
Merge remote-tracking branch 'regulator/topic/da9063' into regulator-next
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/da9063-regulator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/da9063-regulator.c b/drivers/regulator/da9063-regulator.c index b9f2653e4ef..3d910f4f3a0 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; |