Merge branch 'for-armsoc' of git://git.linaro.org/people/rmk/linux-arm

[linux-2.6-block.git] / sound / soc / s6000 / s6000-pcm.c

diff --git a/sound/soc/s6000/s6000-pcm.c b/sound/soc/s6000/s6000-pcm.c
index 43c014f362f60643a9f5f4d798a2c651b6c0af1b..716da861c629399de5e5322b1556c4e7ae46d08e 100644 (file)
--- a/sound/soc/s6000/s6000-pcm.c
+++ b/sound/soc/s6000/s6000-pcm.c
@@ -435,7 +435,8 @@ static void s6000_pcm_free(struct snd_pcm *pcm)
 {
        struct snd_soc_pcm_runtime *runtime = pcm->private_data;
        struct s6000_pcm_dma_params *params =
-               snd_soc_dai_get_dma_data(runtime->cpu_dai, pcm->streams[0].substream);
+               snd_soc_dai_get_dma_data(runtime->cpu_dai,
+                       pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream);
 
        free_irq(params->irq, pcm);
        snd_pcm_lib_preallocate_free_for_all(pcm);
@@ -451,7 +452,7 @@ static int s6000_pcm_new(struct snd_soc_pcm_runtime *runtime)
        int res;
 
        params = snd_soc_dai_get_dma_data(runtime->cpu_dai,
-                       pcm->streams[0].substream);
+                       pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream);
 
        if (!card->dev->dma_mask)
                card->dev->dma_mask = &s6000_pcm_dmamask;