Merge tag 'hsi-for-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi

[linux-2.6-block.git] / drivers / hsi / clients / cmt_speech.c

diff --git a/drivers/hsi/clients/cmt_speech.c b/drivers/hsi/clients/cmt_speech.c
index 05b80723d39dd831d8796231fb29db605c33b033..8fbbacb0fe21ec5937ad8a123b1aefb6f5ee44a6 100644 (file)
--- a/drivers/hsi/clients/cmt_speech.c
+++ b/drivers/hsi/clients/cmt_speech.c
@@ -1124,10 +1124,10 @@ static int cs_char_fasync(int fd, struct file *file, int on)
        return 0;
 }
 
-static unsigned int cs_char_poll(struct file *file, poll_table *wait)
+static __poll_t cs_char_poll(struct file *file, poll_table *wait)
 {
        struct cs_char *csdata = file->private_data;
-       unsigned int ret = 0;
+       __poll_t ret = 0;
 
        poll_wait(file, &cs_char_data.wait, wait);
        spin_lock_bh(&csdata->lock);