Merge branch 'for-next' into for-linus

4.18-rc1 merge material.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 2 insertions, 8 deletions

diff --git a/sound/core/pcm_compat.c b/sound/core/pcm_compat.c
index 6491afbb5fd5..39d853bfa5ac 100644
--- a/sound/core/pcm_compat.c
+++ b/sound/core/pcm_compat.c
@@ -45,10 +45,7 @@ static int snd_pcm_ioctl_rewind_compat(struct snd_pcm_substream *substream,
 
         if (get_user(frames, src))
                 return -EFAULT;
-        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-                err = snd_pcm_playback_rewind(substream, frames);
-        else
-                err = snd_pcm_capture_rewind(substream, frames);
+        err = snd_pcm_rewind(substream, frames);
         if (put_user(err, src))
                 return -EFAULT;
         return err < 0 ? err : 0;
@@ -62,10 +59,7 @@ static int snd_pcm_ioctl_forward_compat(struct snd_pcm_substream *substream,
 
         if (get_user(frames, src))
                 return -EFAULT;
-        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-                err = snd_pcm_playback_forward(substream, frames);
-        else
-                err = snd_pcm_capture_forward(substream, frames);
+        err = snd_pcm_forward(substream, frames);
         if (put_user(err, src))
                 return -EFAULT;
         return err < 0 ? err : 0;