Merge branch 'fix/misc' into for-next

diff --cc sound/arm/aaci.c
index 9ea308d4f1b3c1ff7afaadc4ac7111b0377286b2,6c160a038b239a7c9e2baa0d3f941c68c7d68398..570ab234ce124f68adca5077796b51b0e42a325c
--- 1/sound/arm/aaci.c
--- 2/sound/arm/aaci.c
+++ b/sound/arm/aaci.c
@@@ -500,9 -504,13 +500,13 @@@ static int aaci_pcm_hw_params(struct sn
        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));
 +      err = snd_pcm_lib_malloc_pages(substream,
 +                                     params_buffer_bytes(params));
        if (err < 0)
                goto out;