diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-07 11:42:01 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-07 11:42:01 +0100 |
| commit | b9b5cc26d0b3a9b361cc56c3a3b0d6f819b9195f (patch) | |
| tree | 0e0a579d5c2007dae38cd77eff4e60c1fd43fcf1 /sound/soc/omap | |
| parent | 6a90d536feeccb2c84a2831252b1ed4642684da3 (diff) | |
| parent | c12abc012e18b362204345c323536f228d65c4db (diff) | |
| download | linux-0-day-b9b5cc26d0b3a9b361cc56c3a3b0d6f819b9195f.tar.gz linux-0-day-b9b5cc26d0b3a9b361cc56c3a3b0d6f819b9195f.tar.xz | |
Merge branch 'for-2.6.31' into for-2.6.32
Diffstat (limited to 'sound/soc/omap')
| -rw-r--r-- | sound/soc/omap/omap-mcbsp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index a5d46a7b196a3..6a837ffd5d0bf 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -183,21 +183,21 @@ static int omap_mcbsp_dai_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; struct omap_mcbsp_data *mcbsp_data = to_mcbsp(cpu_dai->private_data); - int err = 0; + int err = 0, play = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK); switch (cmd) { case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_RESUME: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: - if (!mcbsp_data->active++) - omap_mcbsp_start(mcbsp_data->bus_id); + mcbsp_data->active++; + omap_mcbsp_start(mcbsp_data->bus_id, play, !play); break; case SNDRV_PCM_TRIGGER_STOP: case SNDRV_PCM_TRIGGER_SUSPEND: case SNDRV_PCM_TRIGGER_PAUSE_PUSH: - if (!--mcbsp_data->active) - omap_mcbsp_stop(mcbsp_data->bus_id); + omap_mcbsp_stop(mcbsp_data->bus_id, play, !play); + mcbsp_data->active--; break; default: err = -EINVAL; |