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

2013-09-30 12:04:29 +01:00 · 2013-09-30 12:04:29 +01:00 · e7b87825e8
--- 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