From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 30 Nov 2009 14:02:26 +0000 (+0100)
Subject: Merge branch 'fix/misc' into for-next
X-Git-Tag: next-20110726~34^2~924
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d00532aa7ad2e95d02c03c06e9c8e97944065c64;p=karo-tx-linux.git

Merge branch 'fix/misc' into for-next
---

d00532aa7ad2e95d02c03c06e9c8e97944065c64
diff --cc sound/arm/aaci.c
index 9ea308d4f1b3,6c160a038b23..570ab234ce12
--- a/sound/arm/aaci.c
+++ b/sound/arm/aaci.c
@@@ -500,9 -504,13 +500,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;