aboutsummaryrefslogtreecommitdiffstats
path: root/sound/arm
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2009-11-29 16:39:52 +0000
committerTakashi Iwai <tiwai@suse.de>2009-11-30 14:50:53 +0100
commit4acd57c3de62374fe5bb52e5cd24538190f4eab2 (patch)
treed611ef755ef4951f2308249460f805bbd1cd2dca /sound/arm
parent77a9d3eb774f50965106cb2937be660d093a5272 (diff)
downloadkernel_samsung_aries-4acd57c3de62374fe5bb52e5cd24538190f4eab2.zip
kernel_samsung_aries-4acd57c3de62374fe5bb52e5cd24538190f4eab2.tar.gz
kernel_samsung_aries-4acd57c3de62374fe5bb52e5cd24538190f4eab2.tar.bz2
ALSA: AACI: fix AC97 multiple-open bug
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Cc: <stable@kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/arm')
-rw-r--r--sound/arm/aaci.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c
index 1f0f821..1cb7c28 100644
--- a/sound/arm/aaci.c
+++ b/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));