lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 015/639] soc: aspeed: Fix snoop_file_poll()s return type
    Date
    From: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>

    commit a4e55ccd4392e70f296d12e81b93c6ca96ee21d5 upstream.

    snoop_file_poll() is defined as returning 'unsigned int' but the
    .poll method is declared as returning '__poll_t', a bitwise type.

    Fix this by using the proper return type and using the EPOLL
    constants instead of the POLL ones, as required for __poll_t.

    Link: https://lore.kernel.org/r/20191121051851.268726-1-joel@jms.id.au
    Fixes: 3772e5da4454 ("drivers/misc: Aspeed LPC snoop output using misc chardev")
    Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
    Reviewed-by: Joel Stanley <joel@jms.id.au>
    Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
    Signed-off-by: Joel Stanley <joel@jms.id.au>
    Signed-off-by: Olof Johansson <olof@lixom.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/misc/aspeed-lpc-snoop.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/misc/aspeed-lpc-snoop.c
    +++ b/drivers/misc/aspeed-lpc-snoop.c
    @@ -101,13 +101,13 @@ static ssize_t snoop_file_read(struct fi
    return ret ? ret : copied;
    }

    -static unsigned int snoop_file_poll(struct file *file,
    +static __poll_t snoop_file_poll(struct file *file,
    struct poll_table_struct *pt)
    {
    struct aspeed_lpc_snoop_channel *chan = snoop_file_to_chan(file);

    poll_wait(file, &chan->wq, pt);
    - return !kfifo_is_empty(&chan->fifo) ? POLLIN : 0;
    + return !kfifo_is_empty(&chan->fifo) ? EPOLLIN : 0;
    }

    static const struct file_operations snoop_fops = {

    \
     
     \ /
      Last update: 2020-01-24 11:09    [W:2.068 / U:0.428 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site