diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-27 19:47:03 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-27 19:47:03 +0000 |
| commit | ae523fc5744e5fbe52e2fb790801ffcef51e4612 (patch) | |
| tree | a40b8071fdbb6a945c3791f03798a2bfe96d7e11 /drivers/regulator | |
| parent | 6806a663b0a1bb99b18fd5b49e81440eceb2d7a1 (diff) | |
| parent | 22d881c068403c155fbe320c0a26e3b1bcdaa1b8 (diff) | |
| download | blackbird-op-linux-ae523fc5744e5fbe52e2fb790801ffcef51e4612.tar.gz blackbird-op-linux-ae523fc5744e5fbe52e2fb790801ffcef51e4612.zip | |
Merge remote-tracking branch 'regulator/topic/dt' into regulator-next
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/fixed.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c index 6828dce72371..72abbf5507a6 100644 --- a/drivers/regulator/fixed.c +++ b/drivers/regulator/fixed.c @@ -163,12 +163,17 @@ static struct regulator_ops fixed_voltage_ops = { static int __devinit reg_fixed_voltage_probe(struct platform_device *pdev) { - struct fixed_voltage_config *config = pdev->dev.platform_data; + struct fixed_voltage_config *config; struct fixed_voltage_data *drvdata; int ret; if (pdev->dev.of_node) config = of_get_fixed_voltage_config(&pdev->dev); + else + config = pdev->dev.platform_data; + + if (!config) + return -ENOMEM; drvdata = kzalloc(sizeof(struct fixed_voltage_data), GFP_KERNEL); if (drvdata == NULL) { |
