diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2018-02-28 17:02:13 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2018-02-28 17:02:13 +0100 |
| commit | 024f962d4b2458ee814a6b0bb1027e3504cf7b74 (patch) | |
| tree | 5a70315f2491ba1375ffe7e8cf8aec6ade17d139 | |
| parent | e2c1313a4794efd28cd34e8c1ae668183254dfd7 (diff) | |
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 <linux@roeck-us.net>
Cc: Eric Biggers <ebiggers@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
| -rw-r--r-- | drivers/android/binder.c | 4 |
1 files changed, 1 insertions, 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; |