summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-30 12:04:29 +0100
committerMark Brown <broonie@linaro.org>2013-09-30 12:04:29 +0100
commite7b87825e8100e1e1456840fc0d99a951631c036 (patch)
treebbcb1dfffe7823ce9e316e4a47fb81133932a74a
parent15c03dd4859ab16f9212238f29dd315654aa94f6 (diff)
parente8cb204c675e05105ab2c93c73c57607e09d6b41 (diff)
downloadlinux-e7b87825e8100e1e1456840fc0d99a951631c036.tar.bz2
Merge remote-tracking branch 'regulator/fix/da9063' into regulator-linus
-rw-r--r--drivers/regulator/da9063-regulator.c2
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