Provide a wrapper to prevent possible ERR_PTR dereference by clk_get_rate().
The return value of clk_get_sys() was immediately used in clk_get_rate(). The first one may return ERR_PTR and the latter only checks if supplied argument is non-NULL. Signed-off-by: Krzysztof Kozlowski <[email protected]> --- drivers/clk/ti/clk-3xxx.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/clk/ti/clk-3xxx.c b/drivers/clk/ti/clk-3xxx.c index 757636d166cf..1db3afff34fb 100644 --- a/drivers/clk/ti/clk-3xxx.c +++ b/drivers/clk/ti/clk-3xxx.c @@ -324,6 +324,16 @@ enum { OMAP3_SOC_OMAP3630, }; +static unsigned long __init omap3xxx_clk_get_rate(const char *clk_name) +{ + struct clk *clk = clk_get_sys(NULL, clk_name); + + if (IS_ERR(clk)) + return 0; + + return clk_get_rate(clk); +} + static int __init omap3xxx_dt_clk_init(int soc_type) { if (soc_type == OMAP3_SOC_AM35XX || soc_type == OMAP3_SOC_OMAP3630 || @@ -359,10 +369,10 @@ static int __init omap3xxx_dt_clk_init(int soc_type) ARRAY_SIZE(enable_init_clks)); pr_info("Clocking rate (Crystal/Core/MPU): %ld.%01ld/%ld/%ld MHz\n", - (clk_get_rate(clk_get_sys(NULL, "osc_sys_ck")) / 1000000), - (clk_get_rate(clk_get_sys(NULL, "osc_sys_ck")) / 100000) % 10, - (clk_get_rate(clk_get_sys(NULL, "core_ck")) / 1000000), - (clk_get_rate(clk_get_sys(NULL, "arm_fck")) / 1000000)); + (omap3xxx_clk_get_rate("osc_sys_ck") / 1000000), + (omap3xxx_clk_get_rate("osc_sys_ck") / 100000) % 10, + (omap3xxx_clk_get_rate("core_ck") / 1000000), + (omap3xxx_clk_get_rate("arm_fck") / 1000000)); if (soc_type != OMAP3_SOC_OMAP3430_ES1) omap3_clk_lock_dpll5(); -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
