Commit c76c7ca3 authored by Tim Bird's avatar Tim Bird Committed by Greg Kroah-Hartman
Browse files

staging: android: logger: reorder prepare_to_wait and mutex_lock 



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

Signed-off-by: default avatarTim Bird <tim.bird@am.sony.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3bcfa431

drivers/staging/android/logger.c

+2 −1
Original line number Diff line number Diff line
@@ -172,9 +172,10 @@ static ssize_t logger_read(struct file *file, char __user *buf, 


start:

	while (1) {

		mutex_lock(&log->mutex);



		prepare_to_wait(&log->wq, &wait, TASK_INTERRUPTIBLE);



		mutex_lock(&log->mutex);

		ret = (log->w_off == reader->r_off);

		mutex_unlock(&log->mutex);

		if (!ret)