Merge branch 'fix/misc' into topic/misc

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;