Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

staging: android: logger: reorder prepare_to_wait and mutex_lock

Browse source 
If mutex_lock waits, it will return in state TASK_RUNNING,
rubbing out the effect of prepare_to_wait().

Signed-off-by: Tim Bird <tim.bird@am.sony.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Tim Bird 2012-02-07 18:30:09 -08:00 committed by Greg Kroah-Hartman
parent 3bcfa43133
commit c76c7ca31f
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/staging/android/logger.c
View file

@ -172,9 +172,10 @@ static ssize_t logger_read(struct file *file, char __user *buf,
start: start:
while (1) { while (1) {
mutex_lock(&log->mutex);
prepare_to_wait(&log->wq, &wait, TASK_INTERRUPTIBLE); prepare_to_wait(&log->wq, &wait, TASK_INTERRUPTIBLE);
mutex_lock(&log->mutex);
ret = (log->w_off == reader->r_off); ret = (log->w_off == reader->r_off);
mutex_unlock(&log->mutex); mutex_unlock(&log->mutex);
if (!ret) if (!ret)