浏览代码

PM / OPP: fix incorrect OPP count handling in of_init_opp_table

In of_init_opp_table function, if a failure to add an OPP is
detected, the count of OPPs, yet to be added is not updated.
Fix this by decrementing this count on failure as well.

Signed-off-by: Chander Kashyap <k.chander@samsung.com>
Signed-off-by: Inderpal Singh <inderpal.s@samsung.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Cc: 3.7+ <stable@vger.kernel.org> # 3.7+
Acked-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Chander Kashyap 11 年之前
父节点
当前提交
086abb5859
共有 1 个文件被更改,包括 1 次插入3 次删除
  1. 1 3
      drivers/base/power/opp.c

+ 1 - 3
drivers/base/power/opp.c

@@ -734,11 +734,9 @@ int of_init_opp_table(struct device *dev)
 		unsigned long freq = be32_to_cpup(val++) * 1000;
 		unsigned long freq = be32_to_cpup(val++) * 1000;
 		unsigned long volt = be32_to_cpup(val++);
 		unsigned long volt = be32_to_cpup(val++);
 
 
-		if (dev_pm_opp_add(dev, freq, volt)) {
+		if (dev_pm_opp_add(dev, freq, volt))
 			dev_warn(dev, "%s: Failed to add OPP %ld\n",
 			dev_warn(dev, "%s: Failed to add OPP %ld\n",
 				 __func__, freq);
 				 __func__, freq);
-			continue;
-		}
 		nr -= 2;
 		nr -= 2;
 	}
 	}