summaryrefslogtreecommitdiff
path: root/sound/arm
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-12-01 08:36:05 +0100
committerTakashi Iwai <tiwai@suse.de>2009-12-01 08:36:05 +0100
commitef47bf386e2042c2e483b4ea0259233202ad3ebf (patch)
tree02baba407d2dbae9d367865c3d52d6e9400c8773 /sound/arm
parent306ecee926cf79f1b3b5f6035be09ef3d83f1b76 (diff)
parent8ee763b9c82c6ca0a59a7271ce4fa29d7baf5c09 (diff)
downloadlinux-3.10-ef47bf386e2042c2e483b4ea0259233202ad3ebf.tar.gz
linux-3.10-ef47bf386e2042c2e483b4ea0259233202ad3ebf.tar.bz2
linux-3.10-ef47bf386e2042c2e483b4ea0259233202ad3ebf.zip
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/arm')
-rw-r--r--sound/arm/aaci.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c
index a03fe80a7a7..eb715e73210 100644
--- a/sound/arm/aaci.c
+++ b/sound/arm/aaci.c
@@ -501,6 +501,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));
@@ -514,7 +518,7 @@ static int aaci_pcm_hw_params(struct snd_pcm_substream *substream,
else
err = snd_ac97_pcm_open(aacirun->pcm, params_rate(params),
params_channels(params),
- aacirun->pcm->r[1].slots);
+ aacirun->pcm->r[0].slots);
if (err)
goto out;