]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
mei: replace POLL* with EPOLL* for write queues.
authorTomas Winkler <tomas.winkler@intel.com>
Fri, 28 Sep 2018 20:27:48 +0000 (23:27 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 2 Oct 2018 22:39:59 +0000 (15:39 -0700)
Looks like during merging the bulk POLL* -> EPOLL* replacement
missed the patch
'commit af336cabe083 ("mei: limit the number of queued writes")'

Fix sparse warning:
drivers/misc/mei/main.c:602:13: warning: restricted __poll_t degrades to integer
drivers/misc/mei/main.c:605:30: warning: invalid assignment: |=
drivers/misc/mei/main.c:605:30:    left side has type restricted __poll_t
drivers/misc/mei/main.c:605:30:    right side has type int

Fixes: af336cabe083 ("mei: limit the number of queued writes")
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/misc/mei/main.c

index 4d77a6ae183a95e313abb362c4c5e4a7935f9e6b..87281b3695e607c023ab1fd8a0bc6a5d29bf971b 100644 (file)
@@ -599,10 +599,10 @@ static __poll_t mei_poll(struct file *file, poll_table *wait)
                        mei_cl_read_start(cl, mei_cl_mtu(cl), file);
        }
 
-       if (req_events & (POLLOUT | POLLWRNORM)) {
+       if (req_events & (EPOLLOUT | EPOLLWRNORM)) {
                poll_wait(file, &cl->tx_wait, wait);
                if (cl->tx_cb_queued < dev->tx_queue_limit)
-                       mask |= POLLOUT | POLLWRNORM;
+                       mask |= EPOLLOUT | EPOLLWRNORM;
        }
 
 out: