From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 4 Dec 2009 15:22:32 +0000 (+0100)
Subject: Merge branch 'topic/core-change' into for-linus
X-Git-Tag: v2.6.33-rc1~390^2~3
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=79598324838a25cc378ecbb8c29dd1e3d3951d35;p=~emulex%2Finfiniband.git

Merge branch 'topic/core-change' into for-linus
---

79598324838a25cc378ecbb8c29dd1e3d3951d35
diff --cc sound/arm/aaci.c
index 6c160a038b2,e59372887f3..1534f3d88bc
--- a/sound/arm/aaci.c
+++ b/sound/arm/aaci.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;