binder: fix async space check for 0-sized buffers

[platform/kernel/linux-rpi.git] / drivers / android / binder.c

diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index 367afac..71a40a4 100644 (file)
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -4812,6 +4812,8 @@ static void binder_release_work(struct binder_proc *proc,
                                "undelivered TRANSACTION_ERROR: %u\n",
                                e->cmd);
                } break;
+               case BINDER_WORK_TRANSACTION_PENDING:
+               case BINDER_WORK_TRANSACTION_ONEWAY_SPAM_SUSPECT:
                case BINDER_WORK_TRANSACTION_COMPLETE: {
                        binder_debug(BINDER_DEBUG_DEAD_TRANSACTION,
                                "undelivered TRANSACTION_COMPLETE\n");
@@ -5028,7 +5030,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;