If a platform specific OPP driver has called this routine first and set
the regulators, then the second call from cpufreq-dt driver will hit the
WARN_ON(). Remove the WARN_ON(), but continue to return error in such
cases.

Signed-off-by: Viresh Kumar <viresh.ku...@linaro.org>
Reviewed-by: Stephen Boyd <sb...@codeaurora.org>
Tested-by: Dave Gerlach <d-gerl...@ti.com>
---
 drivers/base/power/opp/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/base/power/opp/core.c b/drivers/base/power/opp/core.c
index ddd4915ffd4f..3c9f223709ab 100644
--- a/drivers/base/power/opp/core.c
+++ b/drivers/base/power/opp/core.c
@@ -1484,7 +1484,7 @@ int dev_pm_opp_set_regulators(struct device *dev, const 
char * const names[],
        }
 
        /* Already have regulators set */
-       if (WARN_ON(opp_table->regulators)) {
+       if (opp_table->regulators) {
                ret = -EBUSY;
                goto err;
        }
-- 
2.7.1.410.g6faf27b

Reply via email to