From 83cadcc7bf34b825cf431475e8e22dbf0d9a3796 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sun, 29 Nov 2009 16:39:52 +0000
Subject: [PATCH] --- yaml --- r: 168879 b: refs/heads/master c:
 4acd57c3de62374fe5bb52e5cd24538190f4eab2 h: refs/heads/master i:   168877:
 2d380003e24b803080b43f27d97ce514166d8bf8   168875:
 9b90bb7007dabf7f552830a8ff125241ec21eb06   168871:
 2b44c84ec34b0e29a8f5741ce6c4209a601cb53c   168863:
 86852339954ffeb287687826fcb58403a1152825 v: v3

---
 [refs]                 | 2 +-
 trunk/sound/arm/aaci.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2fd79b63535c..92175765fb45 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77a9d3eb774f50965106cb2937be660d093a5272
+refs/heads/master: 4acd57c3de62374fe5bb52e5cd24538190f4eab2
diff --git a/trunk/sound/arm/aaci.c b/trunk/sound/arm/aaci.c
index 1f0f8213e2d5..1cb7c282a1fb 100644
--- a/trunk/sound/arm/aaci.c
+++ b/trunk/sound/arm/aaci.c
@@ -504,6 +504,10 @@ static int aaci_pcm_hw_params(struct snd_pcm_substream *substream,
 	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));