OSDN Git Service

Revert "binder: add missing binder_unlock()"
authorGreg Kroah-Hartman <gregkh@google.com>
Wed, 28 Feb 2018 16:02:13 +0000 (17:02 +0100)
committerGreg Kroah-Hartman <gregkh@google.com>
Wed, 28 Feb 2018 16:02:13 +0000 (17:02 +0100)
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>
drivers/android/binder.c

index 9270da8..7286cf9 100644 (file)
@@ -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;