diff options
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/omap/omap-mcbsp.c | 3 | ||||
| -rw-r--r-- | sound/soc/soc-dsp.c | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index 36d1cae..219ca45 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -516,6 +516,9 @@ 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) + return 0; + /* 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 || diff --git a/sound/soc/soc-dsp.c b/sound/soc/soc-dsp.c index 24c8e5e..fd1610d 100644 --- a/sound/soc/soc-dsp.c +++ b/sound/soc/soc-dsp.c @@ -1040,18 +1040,12 @@ static int dsp_run_update_startup(struct snd_soc_pcm_runtime *fe, int stream) fe->cpu_dai->driver->capture.stream_name, SNDRV_PCM_TRIGGER_START); - /* determine trigger command */ - if (fe->dsp[stream].state == SND_SOC_DSP_STATE_START) - cmd = SNDRV_PCM_TRIGGER_START; - else - cmd = SNDRV_PCM_TRIGGER_STOP; - if (dsp_link->trigger[stream] == SND_SOC_DSP_TRIGGER_BESPOKE) { /* call trigger on the frontend - FE takes care of all BE triggers */ dev_dbg(&fe->dev, "dsp: bespoke trigger FE %s cmd start\n", fe->dai_link->name); - ret = soc_pcm_bespoke_trigger(substream, cmd); + ret = soc_pcm_bespoke_trigger(substream, SNDRV_PCM_TRIGGER_START); if (ret < 0) { dev_err(&fe->dev,"dsp: trigger FE failed %d\n", ret); return ret; |