init_opp is seen to crash, in resource34xx.c BUG() causes a kernel oops when OPP layer is not registered! Original Report: http://marc.info/?l=linux-omap&m=127268352116119&w=2 Cc: Peter Tseng <tsenpet09@xxxxxxxxx> Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx> Reported-by: Peter Tseng <tsenpet09@xxxxxxxxx> Signed-off-by: Nishanth Menon <nm@xxxxxx> --- IMPORTANT: Completely untested!! just for a dry-run and srf is going to go away in a month, so this is more or less a curio.. arch/arm/mach-omap2/resource34xx.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/resource34xx.c b/arch/arm/mach-omap2/resource34xx.c index c6cce8b..ae8bd09 100644 --- a/arch/arm/mach-omap2/resource34xx.c +++ b/arch/arm/mach-omap2/resource34xx.c @@ -226,14 +226,36 @@ void init_opp(struct shared_resource *resp) dpll1_clk = clk_get(NULL, "dpll1_ck"); dpll2_clk = clk_get(NULL, "dpll2_ck"); ret = freq_to_opp(&opp_id, OPP_MPU, dpll1_clk->rate); - BUG_ON(ret); /* TBD Cleanup handling */ + if (ret) { + pr_err("%s: initializing %s failed! !match for %ld\n", + __func__, resp->name, dpll1_clk->rate); + if (dpll1_clk) + clk_put(dpll1_clk); + if (dpll2_clk) + clk_put(dpll2_clk); + dpll1_clk = NULL; + dpll2_clk = NULL; + vdd1_resp = NULL; + return; + } curr_vdd1_opp = opp_id; } else if (strcmp(resp->name, "vdd2_opp") == 0) { vdd2_resp = resp; dpll3_clk = clk_get(NULL, "dpll3_m2_ck"); l3_clk = clk_get(NULL, "l3_ick"); ret = freq_to_opp(&opp_id, OPP_L3, l3_clk->rate); - BUG_ON(ret); /* TBD Cleanup handling */ + if (ret) { + pr_err("%s: initializing %s failed! !match for %ld\n", + __func__, resp->name, l3_clk->rate); + if (l3_clk) + clk_put(l3_clk); + if (dpll3_clk) + clk_put(dpll3_clk); + l3_clk = NULL; + dpll3_clk = NULL; + vdd2_resp = NULL; + return; + } curr_vdd2_opp = opp_id; } resp->curr_level = opp_id; -- 1.7.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
