clk: ti: Fix error handling in ti_clk_parse_divider_data() (303aef8b) · Commits · e / devices / android_kernel_fairphone_FP5

The ti_clk_parse_divider_data() function is only called from _get_div_table_from_setup(). That function doesn't look at the return value but instead looks at the "*table" pointer. In this case, if the kcalloc() fails then *table is NULL (which means success). It should instead be an error pointer. The ti_clk_parse_divider_data() function has two callers. One checks for errors and the other doesn't. I have fixed it so now both handle errors. Fixes: ("clk: ti: divider: add driver internal API for parsing divider data") Signed-off-by:

Dan Carpenter <dan.carpenter@oracle.com> Acked-by:

Tero Kristo <t-kristo@ti.com> Signed-off-by:

Stephen Boyd <sboyd@kernel.org>

drivers/clk/ti/divider.c

+10 −1

Original line number	Diff line number	Diff line
		@@ -403,8 +403,10 @@ int ti_clk_parse_divider_data(int *div_table, int num_dividers, int max_div,
		num_dividers = i;

		tmp = kcalloc(valid_div + 1, sizeof(*tmp), GFP_KERNEL);
		if (!tmp)
		if (!tmp) {
		*table = ERR_PTR(-ENOMEM);
		return -ENOMEM;
		}

		valid_div = 0;
		*width = 0;
		@@ -439,6 +441,7 @@ struct clk_hw ti_clk_build_component_div(struct ti_clk_divider setup)
		{
		struct clk_omap_divider *div;
		struct clk_omap_reg *reg;
		int ret;

		if (!setup)
		return NULL;
		@@ -458,6 +461,12 @@ struct clk_hw ti_clk_build_component_div(struct ti_clk_divider setup)
		div->flags \|= CLK_DIVIDER_POWER_OF_TWO;

		div->table = _get_div_table_from_setup(setup, &div->width);
		if (IS_ERR(div->table)) {
		ret = PTR_ERR(div->table);
		kfree(div);
		return ERR_PTR(ret);
		}


		div->shift = setup->bit_shift;
		div->latch = -EINVAL;