]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ALSA: AACI: fix AC97 multiple-open bug
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 29 Nov 2009 16:39:52 +0000 (16:39 +0000)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 8 Dec 2009 18:21:00 +0000 (10:21 -0800)
commit 4acd57c3de62374fe5bb52e5cd24538190f4eab2 upstream.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
sound/arm/aaci.c

index dc78272fc39ff2cb01a42e5206d16041987e5d98..d3f1912aa2a1fe6380ab9eb2c18f6ced70e25057 100644 (file)
@@ -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));