Merge branch 'perf/urgent' into perf/core

Merge reason: queue up dependent patch, update to -rc4

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 2 deletions

diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index b074a594c595..9edef4684978 100644
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -752,7 +752,7 @@ static int snd_pcm_alloc_vmalloc_buffer(struct snd_pcm_substream *subs, size_t s
                         return 0; /* already large enough */
                 vfree(runtime->dma_area);
         }
-        runtime->dma_area = vmalloc(size);
+        runtime->dma_area = vmalloc_user(size);
         if (!runtime->dma_area)
                 return -ENOMEM;
         runtime->dma_bytes = size;
@@ -1936,7 +1936,7 @@ static int snd_usb_pcm_close(struct snd_pcm_substream *substream, int direction)
         struct snd_usb_stream *as = snd_pcm_substream_chip(substream);
         struct snd_usb_substream *subs = &as->substream[direction];
 
-        if (subs->interface >= 0) {
+        if (!as->chip->shutdown && subs->interface >= 0) {
                 usb_set_interface(subs->dev, subs->interface, 0);
                 subs->interface = -1;
         }