diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2018-09-28 16:27:48 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-02 18:39:59 -0400 |
commit | 03b2cbb6ea3c73e08fcf72d9ef8e286c4dcbd1fe (patch) | |
tree | 25c6f6c77920adbc7676b38183d054243a8e396f | |
parent | 6011002c1584d29c317e0895b9667d57f254537a (diff) |
mei: replace POLL* with EPOLL* for write queues.
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>
-rw-r--r-- | drivers/misc/mei/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c index 4d77a6ae183a..87281b3695e6 100644 --- a/drivers/misc/mei/main.c +++ b/drivers/misc/mei/main.c | |||
@@ -599,10 +599,10 @@ static __poll_t mei_poll(struct file *file, poll_table *wait) | |||
599 | mei_cl_read_start(cl, mei_cl_mtu(cl), file); | 599 | mei_cl_read_start(cl, mei_cl_mtu(cl), file); |
600 | } | 600 | } |
601 | 601 | ||
602 | if (req_events & (POLLOUT | POLLWRNORM)) { | 602 | if (req_events & (EPOLLOUT | EPOLLWRNORM)) { |
603 | poll_wait(file, &cl->tx_wait, wait); | 603 | poll_wait(file, &cl->tx_wait, wait); |
604 | if (cl->tx_cb_queued < dev->tx_queue_limit) | 604 | if (cl->tx_cb_queued < dev->tx_queue_limit) |
605 | mask |= POLLOUT | POLLWRNORM; | 605 | mask |= EPOLLOUT | EPOLLWRNORM; |
606 | } | 606 | } |
607 | 607 | ||
608 | out: | 608 | out: |