Merge branch 'topic/core-change' into for-linus
Takashi Iwai [Fri, 4 Dec 2009 15:22:32 +0000 (16:22 +0100)]
1  2 
sound/arm/aaci.c
sound/soc/codecs/tlv320aic23.c

@@@ -504,13 -503,9 +503,13 @@@ static int aaci_pcm_hw_params(struct sn
        int err;
  
        aaci_pcm_hw_free(substream);
 +      if (aacirun->pcm_open) {
 +              snd_ac97_pcm_close(aacirun->pcm);
 +              aacirun->pcm_open = 0;
 +      }
  
-       err = devdma_hw_alloc(NULL, substream,
-                             params_buffer_bytes(params));
+       err = snd_pcm_lib_malloc_pages(substream,
+                                      params_buffer_bytes(params));
        if (err < 0)
                goto out;
  
Simple merge