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

[sfrench/cifs-2.6.git] / sound / core / pcm_native.c

diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 2a730f38e37563139b2f35dbb6952854edfdf54a..22995cb3bd447ee0744e142b9a6500b706d85853 100644 (file)
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -1774,7 +1774,7 @@ static int snd_pcm_drain(struct snd_pcm_substream *substream,
        struct snd_card *card;
        struct snd_pcm_runtime *runtime;
        struct snd_pcm_substream *s;
-       wait_queue_t wait;
+       wait_queue_entry_t wait;
        int result = 0;
        int nonblock = 0;
 
@@ -2465,7 +2465,7 @@ static int snd_pcm_capture_open(struct inode *inode, struct file *file)
 static int snd_pcm_open(struct file *file, struct snd_pcm *pcm, int stream)
 {
        int err;
-       wait_queue_t wait;
+       wait_queue_entry_t wait;
 
        if (pcm == NULL) {
                err = -ENODEV;