PM / Domain: Return 0 on error from of_genpd_opp_to_performance_state()

vireshk · rafaeljw · commit 9ad14c001651 · 2018-05-24T19:08:14.000+02:00
of_genpd_opp_to_performance_state() should return 0 on errors, as its doc comment describes. While it follows that mostly, it returns a negative error number on one of the failures. Fix that. Fixes: 6e41766 "PM / Domain: Implement of_genpd_opp_to_performance_state()" Reported-by: Rajendra Nayak <rnayak@codeaurora.org> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Acked-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
@@ -2431,7 +2431,8 @@ unsigned int of_genpd_opp_to_performance_state(struct device *dev,
 
 	opp = of_dev_pm_opp_find_required_opp(&genpd->dev, opp_node);
 	if (IS_ERR(opp)) {
-		state = PTR_ERR(opp);
+		dev_err(dev, "Failed to find required OPP: %ld\n",
+			PTR_ERR(opp));
 		goto unlock;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -2431,7 +2431,8 @@ unsigned int of_genpd_opp_to_performance_state(struct device *dev,`
`2431`	`2431`
`2432`	`2432`	`opp = of_dev_pm_opp_find_required_opp(&genpd->dev, opp_node);`
`2433`	`2433`	`if (IS_ERR(opp)) {`
`2434`		`- state = PTR_ERR(opp);`
	`2434`	`+ dev_err(dev, "Failed to find required OPP: %ld\n",`
	`2435`	`+ PTR_ERR(opp));`
`2435`	`2436`	`goto unlock;`
`2436`	`2437`	`}`
`2437`	`2438`