diff options
| author | Dima Zavin <dima@android.com> | 2011-09-12 11:43:34 -0700 |
|---|---|---|
| committer | Dima Zavin <dima@android.com> | 2011-09-12 11:43:34 -0700 |
| commit | 5d9e2fcd0efd6fcdd98f734406046c5bcba80b40 (patch) | |
| tree | 48a1434005a5f364c5d91ac93e2163ac2968f994 /sound/soc/omap/omap-abe.c | |
| parent | 410ad9441e0d5b831d2ebb054c638915c1988ba2 (diff) | |
| parent | b0ed5170e36453c714e7a16b309126c3709ec02a (diff) | |
| download | kernel_samsung_tuna-5d9e2fcd0efd6fcdd98f734406046c5bcba80b40.zip kernel_samsung_tuna-5d9e2fcd0efd6fcdd98f734406046c5bcba80b40.tar.gz kernel_samsung_tuna-5d9e2fcd0efd6fcdd98f734406046c5bcba80b40.tar.bz2 | |
Merge branch 'linux-omap-3.0' into android-omap-3.0
Diffstat (limited to 'sound/soc/omap/omap-abe.c')
| -rw-r--r-- | sound/soc/omap/omap-abe.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sound/soc/omap/omap-abe.c b/sound/soc/omap/omap-abe.c index 316173a..6d2fd97 100644 --- a/sound/soc/omap/omap-abe.c +++ b/sound/soc/omap/omap-abe.c @@ -746,24 +746,23 @@ static void playback_trigger(struct snd_pcm_substream *substream, unmute_fe_port(substream, dai, stream); break; case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + /* mute FE port */ + mute_fe_port(substream, dai, stream); + /* disable Frontend sDMA */ disable_fe_port(substream, dai, stream); snd_soc_dsp_platform_trigger(substream, cmd, fe->platform); - - /* mute FE port */ - mute_fe_port(substream, dai, stream); break; case SNDRV_PCM_TRIGGER_STOP: /* does this trigger() apply to the FE ? */ if (snd_soc_dsp_is_trigger_for_fe(fe, stream)) { + /* mute FE port */ + mute_fe_port(substream, dai, stream); /* disable the transfer */ disable_fe_port(substream, dai, stream); snd_soc_dsp_platform_trigger(substream, cmd, fe->platform); - - /* mute FE port */ - mute_fe_port(substream, dai, stream); } /* disable BE ports */ |