The return value of clk_get_sys() was immediately used in clk_set_parent(). The first one may return ERR_PTR and the latter only checks if supplied argument is non-NULL. Signed-off-by: Krzysztof Kozlowski <k.kozlowski@xxxxxxxxxxx> --- drivers/clk/ti/clk-33xx.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/clk/ti/clk-33xx.c b/drivers/clk/ti/clk-33xx.c index 028b33783d38..c08db8944fb8 100644 --- a/drivers/clk/ti/clk-33xx.c +++ b/drivers/clk/ti/clk-33xx.c @@ -141,10 +141,12 @@ int __init am33xx_dt_clk_init(void) clk1 = clk_get_sys(NULL, "sys_clkin_ck"); clk2 = clk_get_sys(NULL, "timer3_fck"); - clk_set_parent(clk2, clk1); + if (!IS_ERR(clk1) && !IS_ERR(clk2)) + clk_set_parent(clk2, clk1); clk2 = clk_get_sys(NULL, "timer6_fck"); - clk_set_parent(clk2, clk1); + if (!IS_ERR(clk1) && !IS_ERR(clk2)) + clk_set_parent(clk2, clk1); /* * The On-Chip 32K RC Osc clock is not an accurate clock-source as per * the design/spec, so as a result, for example, timer which supposed @@ -154,7 +156,8 @@ int __init am33xx_dt_clk_init(void) */ clk1 = clk_get_sys(NULL, "wdt1_fck"); clk2 = clk_get_sys(NULL, "clkdiv32k_ick"); - clk_set_parent(clk1, clk2); + if (!IS_ERR(clk1) && !IS_ERR(clk2)) + clk_set_parent(clk1, clk2); return 0; } -- 1.9.1 -- 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
