diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-30 13:04:29 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-30 13:04:29 +0200 |
| commit | e7b87825e8100e1e1456840fc0d99a951631c036 (patch) | |
| tree | bbcb1dfffe7823ce9e316e4a47fb81133932a74a /drivers | |
| parent | Linux 3.12-rc3 (diff) | |
| parent | regulator: da9063: Fix PTR_ERR/ERR_PTR mismatch (diff) | |
| download | linux-e7b87825e8100e1e1456840fc0d99a951631c036.tar.xz linux-e7b87825e8100e1e1456840fc0d99a951631c036.zip | |
Merge remote-tracking branch 'regulator/fix/da9063' into regulator-linus
Diffstat (limited to 'drivers')
| -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 1a7816390773..b9f2653e4ef9 100644 --- a/drivers/regulator/da9063-regulator.c +++ b/drivers/regulator/da9063-regulator.c @@ -709,7 +709,7 @@ static struct da9063_regulators_pdata *da9063_parse_regulators_dt( struct of_regulator_match **da9063_reg_matches) { da9063_reg_matches = NULL; - return PTR_ERR(-ENODEV); + return ERR_PTR(-ENODEV); } #endif |