diff options
| author | Carlos Llamas <cmllamas@google.com> | 2023-12-01 17:21:30 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-01-20 11:50:10 +0100 |
| commit | ee14fd2c8b0aa19fa6b2723169fd6d3283c082db (patch) | |
| tree | 9b00bbf1b066031d204535daa5fdff6ff7907d1b | |
| parent | bed0acf330b2c50c688f6d9cfbcac2aa57a8e613 (diff) | |
| download | linux-stable-ee14fd2c8b0aa19fa6b2723169fd6d3283c082db.tar.gz linux-stable-ee14fd2c8b0aa19fa6b2723169fd6d3283c082db.tar.bz2 linux-stable-ee14fd2c8b0aa19fa6b2723169fd6d3283c082db.zip | |
binder: use EPOLLERR from eventpoll.h
commit 6ac061db9c58ca5b9270b1b3940d2464fb3ff183 upstream.
Use EPOLLERR instead of POLLERR to make sure it is cast to the correct
__poll_t type. This fixes the following sparse issue:
drivers/android/binder.c:5030:24: warning: incorrect type in return expression (different base types)
drivers/android/binder.c:5030:24: expected restricted __poll_t
drivers/android/binder.c:5030:24: got int
Fixes: f88982679f54 ("binder: check for binder_thread allocation failure in binder_poll()")
Cc: stable@vger.kernel.org
Cc: Eric Biggers <ebiggers@google.com>
Reviewed-by: Alice Ryhl <aliceryhl@google.com>
Signed-off-by: Carlos Llamas <cmllamas@google.com>
Link: https://lore.kernel.org/r/20231201172212.1813387-2-cmllamas@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/android/binder.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/android/binder.c b/drivers/android/binder.c index 9cc3a2b1b4fc..d933ef6cc65a 100644 --- a/drivers/android/binder.c +++ b/drivers/android/binder.c @@ -5005,7 +5005,7 @@ static __poll_t binder_poll(struct file *filp, thread = binder_get_thread(proc); if (!thread) - return POLLERR; + return EPOLLERR; binder_inner_proc_lock(thread->proc); thread->looper |= BINDER_LOOPER_STATE_POLL; |