aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/android/binder.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c
index c6dc1846943f..119d486a5cf7 100644
--- a/drivers/staging/android/binder.c
+++ b/drivers/staging/android/binder.c
@@ -20,6 +20,7 @@
20#include <asm/cacheflush.h> 20#include <asm/cacheflush.h>
21#include <linux/fdtable.h> 21#include <linux/fdtable.h>
22#include <linux/file.h> 22#include <linux/file.h>
23#include <linux/freezer.h>
23#include <linux/fs.h> 24#include <linux/fs.h>
24#include <linux/list.h> 25#include <linux/list.h>
25#include <linux/miscdevice.h> 26#include <linux/miscdevice.h>
@@ -2140,13 +2141,13 @@ retry:
2140 if (!binder_has_proc_work(proc, thread)) 2141 if (!binder_has_proc_work(proc, thread))
2141 ret = -EAGAIN; 2142 ret = -EAGAIN;
2142 } else 2143 } else
2143 ret = wait_event_interruptible_exclusive(proc->wait, binder_has_proc_work(proc, thread)); 2144 ret = wait_event_freezable_exclusive(proc->wait, binder_has_proc_work(proc, thread));
2144 } else { 2145 } else {
2145 if (non_block) { 2146 if (non_block) {
2146 if (!binder_has_thread_work(thread)) 2147 if (!binder_has_thread_work(thread))
2147 ret = -EAGAIN; 2148 ret = -EAGAIN;
2148 } else 2149 } else
2149 ret = wait_event_interruptible(thread->wait, binder_has_thread_work(thread)); 2150 ret = wait_event_freezable(thread->wait, binder_has_thread_work(thread));
2150 } 2151 }
2151 2152
2152 binder_lock(__func__); 2153 binder_lock(__func__);