Merge remote-tracking branch 'regulator/fix/da9063' into regulator-linus

e7b87825 · Mark Brown · 15c03dd4 · e8cb204c · e7b87825
Commit e7b87825 authored Sep 30, 2013 by Mark Brown
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/regulator/da9063-regulator.c drivers/regulator/da9063-regulator.c +1 -1

No files found.
--- 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