Merge tag 'sound-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[linux-2.6-block.git] / drivers / usb / gadget / function / u_uac1_legacy.c

diff --git a/drivers/usb/gadget/function/u_uac1_legacy.c b/drivers/usb/gadget/function/u_uac1_legacy.c
index 8aa76b4dc1170ef7c24386071dc073446bdf1750..fa4684a1c54cddec0ebfcdc40cc1f5184fab22ee 100644 (file)
--- a/drivers/usb/gadget/function/u_uac1_legacy.c
+++ b/drivers/usb/gadget/function/u_uac1_legacy.c
@@ -157,7 +157,6 @@ size_t u_audio_playback(struct gaudio *card, void *buf, size_t count)
        struct gaudio_snd_dev   *snd = &card->playback;
        struct snd_pcm_substream *substream = snd->substream;
        struct snd_pcm_runtime *runtime = substream->runtime;
-       mm_segment_t old_fs;
        ssize_t result;
        snd_pcm_sframes_t frames;
 
@@ -174,15 +173,11 @@ try_again:
        }
 
        frames = bytes_to_frames(runtime, count);
-       old_fs = get_fs();
-       set_fs(KERNEL_DS);
-       result = snd_pcm_lib_write(snd->substream, (void __user *)buf, frames);
+       result = snd_pcm_kernel_write(snd->substream, buf, frames);
        if (result != frames) {
                ERROR(card, "Playback error: %d\n", (int)result);
-               set_fs(old_fs);
                goto try_again;
        }
-       set_fs(old_fs);
 
        return 0;
 }