From 024f962d4b2458ee814a6b0bb1027e3504cf7b74 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 28 Feb 2018 17:02:13 +0100 Subject: [PATCH] Revert "binder: add missing binder_unlock()" This reverts commit bf5a6a7256834ad88104d3a99cc935c9ac49b527. There is no binder_unlock() in this branch, so this patch needs to be reverted. Change-Id: I22dca6eee1e93e712b9b1038c42edc29e679aad6 Cc: Guenter Roeck Cc: Eric Biggers Signed-off-by: Greg Kroah-Hartman --- drivers/android/binder.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/android/binder.c b/drivers/android/binder.c index 9270da81939b..7286cf9a726b 100644 --- a/drivers/android/binder.c +++ b/drivers/android/binder.c @@ -4574,10 +4574,8 @@ static unsigned int binder_poll(struct file *filp, bool wait_for_proc_work; thread = binder_get_thread(proc); - if (!thread) { - binder_unlock(__func__); + if (!thread) return POLLERR; - } binder_inner_proc_lock(thread->proc); thread->looper |= BINDER_LOOPER_STATE_POLL;