diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-24 05:49:38 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-24 05:49:38 -0500 |
| commit | 02fcc84ae551d27c0ef2ee043881cc2afc8f892d (patch) | |
| tree | 49a8842445434134d06cf1898bbd7fb3c99f18f8 /drivers/regulator | |
| parent | 924ee2c9621b65df9dffa8218af5ee9a9b892bba (diff) | |
| parent | 156843470c4b9ea9698cc245d2cff769b3784088 (diff) | |
Merge remote-tracking branch 'regulator/topic/dt' into regulator-next
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/gpio-regulator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c index f0acf52498bd..42e1cb1835e5 100644 --- a/drivers/regulator/gpio-regulator.c +++ b/drivers/regulator/gpio-regulator.c | |||
| @@ -284,7 +284,7 @@ static int __devinit gpio_regulator_probe(struct platform_device *pdev) | |||
| 284 | drvdata->state = state; | 284 | drvdata->state = state; |
| 285 | 285 | ||
| 286 | drvdata->dev = regulator_register(&drvdata->desc, &pdev->dev, | 286 | drvdata->dev = regulator_register(&drvdata->desc, &pdev->dev, |
| 287 | config->init_data, drvdata); | 287 | config->init_data, drvdata, NULL); |
| 288 | if (IS_ERR(drvdata->dev)) { | 288 | if (IS_ERR(drvdata->dev)) { |
| 289 | ret = PTR_ERR(drvdata->dev); | 289 | ret = PTR_ERR(drvdata->dev); |
| 290 | dev_err(&pdev->dev, "Failed to register regulator: %d\n", ret); | 290 | dev_err(&pdev->dev, "Failed to register regulator: %d\n", ret); |