Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

[linux.git] / sound / core / info.c

diff --git a/sound/core/info.c b/sound/core/info.c
index bcf6a48cc70d3b82d78b1b7a944e1bd4e0b1dd5d..aa86f3f8e056506f0a5e1ba1fd2764481ce4b4cc 100644 (file)
--- a/sound/core/info.c
+++ b/sound/core/info.c
@@ -203,11 +203,11 @@ static ssize_t snd_info_entry_write(struct file *file, const char __user *buffer
        return size;
 }
 
-static unsigned int snd_info_entry_poll(struct file *file, poll_table *wait)
+static __poll_t snd_info_entry_poll(struct file *file, poll_table *wait)
 {
        struct snd_info_private_data *data = file->private_data;
        struct snd_info_entry *entry = data->entry;
-       unsigned int mask = 0;
+       __poll_t mask = 0;
 
        if (entry->c.ops->poll)
                return entry->c.ops->poll(entry,