Commit 0c8551e5 authored Dec 12, 2011 by Jarkko Nikula Committed by Tony Lindgren Dec 12, 2011

ARM: OMAP: mcbsp: Fix possible memory corruption



Commits 09d28d ("ARM: OMAP: mcbsp: Start generalize omap2_mcbsp_set_clks_src")
and 7bc0c4 ("ARM: OMAP: mcbsp: Start generalize signal muxing functions")
incorrectly set two struct omap_mcbsp_platform_data fields after
omap_device_build_ss and kfree calls.

Fix this by moving these pdata assignments before those calls.

Signed-off-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Reported-by: NeilBrown <neilb@suse.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>

parent dc47ce90

arch/arm/mach-omap2/mcbsp.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -145,6 +145,9 @@ static int omap_init_mcbsp(struct omap_hwmod oh, void unused)
		pdata->reg_size = 4;
		pdata->has_ccr = true;
		}
		pdata->set_clk_src = omap2_mcbsp_set_clk_src;
		if (id == 1)
		pdata->mux_signal = omap2_mcbsp1_mux_rx_clk;

		if (oh->class->rev == MCBSP_CONFIG_TYPE3) {
		if (id == 2)
		@@ -174,9 +177,6 @@ static int omap_init_mcbsp(struct omap_hwmod oh, void unused)
		name, oh->name);
		return PTR_ERR(pdev);
		}
		pdata->set_clk_src = omap2_mcbsp_set_clk_src;
		if (id == 1)
		pdata->mux_signal = omap2_mcbsp1_mux_rx_clk;
		omap_mcbsp_count++;
		return 0;
		}