[PM-WIP-OPP,1/4] omap3: pm: cpufreq: BUG_ON cleanup

Commit Message

Nishanth Menon March 18, 2010, 6:44 p.m. UTC

None

Patch

diff --git a/arch/arm/mach-omap2/cpufreq34xx.c b/arch/arm/mach-omap2/cpufreq34xx.c
index c453ec5..f0ed3ae 100644
--- a/arch/arm/mach-omap2/cpufreq34xx.c
+++ b/arch/arm/mach-omap2/cpufreq34xx.c
@@ -111,6 +111,7 @@  static struct omap_opp_def __initdata omap36xx_dsp_rate_table[] = {
 
 void __init omap3_pm_init_opp_table(void)
 {
+	int r;
 	struct omap_opp_def **omap3_opp_def_list;
 	struct omap_opp_def *omap34xx_opp_def_list[] = {
 		omap34xx_mpu_rate_table,
@@ -126,8 +127,9 @@  void __init omap3_pm_init_opp_table(void)
 	omap3_opp_def_list = cpu_is_omap3630() ? omap36xx_opp_def_list :
 				omap34xx_opp_def_list;
 
-	BUG_ON(opp_init_list(OPP_MPU, omap3_opp_def_list[0]));
-	BUG_ON(opp_init_list(OPP_L3, omap3_opp_def_list[1]));
-	BUG_ON(opp_init_list(OPP_DSP, omap3_opp_def_list[2]));
+	r = opp_init_list(OPP_MPU, omap3_opp_def_list[0]);
+	r |= opp_init_list(OPP_L3, omap3_opp_def_list[1]);
+	r |= opp_init_list(OPP_DSP, omap3_opp_def_list[2]);
+	BUG_ON(r);
 }