Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebca813c authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-3.1' into for-3.2

parents 689b956e 34c86985

sound/soc/omap/omap-mcbsp.c

+6 −0
Original line number Diff line number Diff line
@@ -516,6 +516,12 @@ static int omap_mcbsp_dai_set_dai_sysclk(struct snd_soc_dai *cpu_dai, 
	struct omap_mcbsp_reg_cfg *regs = &mcbsp_data->regs;

	int err = 0;



	if (mcbsp_data->active)

		if (freq == mcbsp_data->in_freq)

			return 0;

		else

			return -EBUSY;



	/* The McBSP signal muxing functions are only available on McBSP1 */

	if (clk_id == OMAP_MCBSP_CLKR_SRC_CLKR ||

	    clk_id == OMAP_MCBSP_CLKR_SRC_CLKX ||