diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-23 13:50:59 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-23 13:50:59 -0500 |
| commit | 924ee2c9621b65df9dffa8218af5ee9a9b892bba (patch) | |
| tree | 316d72848181d4198dad3407ba5441083708ab7e /drivers/regulator/dummy.c | |
| parent | 68aaa37d0e8232d62a7e9411699e0dc005750186 (diff) | |
| parent | 69511a452e6dc6b74fe4f3671a51b1b44b9c57e3 (diff) | |
Merge remote-tracking branch 'regulator/topic/dt' into regulator-next
Diffstat (limited to 'drivers/regulator/dummy.c')
| -rw-r--r-- | drivers/regulator/dummy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/dummy.c b/drivers/regulator/dummy.c index b8f520513ce7..0ee00de4be72 100644 --- a/drivers/regulator/dummy.c +++ b/drivers/regulator/dummy.c | |||
| @@ -42,7 +42,7 @@ static int __devinit dummy_regulator_probe(struct platform_device *pdev) | |||
| 42 | int ret; | 42 | int ret; |
| 43 | 43 | ||
| 44 | dummy_regulator_rdev = regulator_register(&dummy_desc, NULL, | 44 | dummy_regulator_rdev = regulator_register(&dummy_desc, NULL, |
| 45 | &dummy_initdata, NULL); | 45 | &dummy_initdata, NULL, NULL); |
| 46 | if (IS_ERR(dummy_regulator_rdev)) { | 46 | if (IS_ERR(dummy_regulator_rdev)) { |
| 47 | ret = PTR_ERR(dummy_regulator_rdev); | 47 | ret = PTR_ERR(dummy_regulator_rdev); |
| 48 | pr_err("Failed to register regulator: %d\n", ret); | 48 | pr_err("Failed to register regulator: %d\n", ret); |