diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2018-03-05 20:20:17 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2018-03-05 20:20:17 +0530 |
| commit | 24740dab5ca50d4c376a08b61e33c8d3810a726f (patch) | |
| tree | bc26460a04bd1fc644df3886b0f02834fed57862 /drivers/android | |
| parent | 59e35359ec360b74e9013ccab84c19ce53db38f9 (diff) | |
| parent | a2b5256f1edd2d412d14ec9dceb1d28e39a794e4 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Conflicts:
fs/f2fs/extent_cache.c
Pick changes from AOSP Change-Id: Icd8a85ac0c19a8aa25cd2591a12b4e9b85bdf1c5
("f2fs: catch up to v4.14-rc1")
fs/f2fs/namei.c
Pick changes from AOSP F2FS backport commit 7d5c08fd9194
("f2fs: backport from (4c1fad64 - Merge tag 'for-f2fs-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs)")
Diffstat (limited to 'drivers/android')
| -rw-r--r-- | drivers/android/binder.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/android/binder.c b/drivers/android/binder.c index b4a958e20c44..2cb91dcf2e2a 100644 --- a/drivers/android/binder.c +++ b/drivers/android/binder.c @@ -4553,6 +4553,10 @@ static unsigned int binder_poll(struct file *filp, bool wait_for_proc_work; thread = binder_get_thread(proc); + if (!thread) { + binder_unlock(__func__); + return POLLERR; + } binder_inner_proc_lock(thread->proc); thread->looper |= BINDER_LOOPER_STATE_POLL; |