diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-09-23 11:52:09 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-09-23 11:52:09 +0100 |
| commit | ebca813cf08bc1db6a7b211eddc8ca747b6291bc (patch) | |
| tree | 37ac49b0fd0e7ec65f43952621e86d2d6eaf5409 /sound/soc/omap | |
| parent | 689b956e2cf87bf3f67163964d69bca97befafaa (diff) | |
| parent | 34c869855a28af3c6031d29e2267b5a3cce0d67d (diff) | |
| download | linux-stable-ebca813cf08bc1db6a7b211eddc8ca747b6291bc.tar.gz linux-stable-ebca813cf08bc1db6a7b211eddc8ca747b6291bc.tar.bz2 linux-stable-ebca813cf08bc1db6a7b211eddc8ca747b6291bc.zip | |
Merge branch 'for-3.1' into for-3.2
Diffstat (limited to 'sound/soc/omap')
| -rw-r--r-- | sound/soc/omap/omap-mcbsp.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index ebcc2d4d2b18..478d60778453 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -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 || |