From: Tim Bird <tim.bird@am.sony.com>
Date: Wed, 8 Feb 2012 02:30:09 +0000 (-0800)
Subject: staging: android: logger: reorder prepare_to_wait and mutex_lock
X-Git-Tag: v3.12-rc1~3673^2~176^2~163
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c76c7ca31f16c9556cad527bfa3504b0aafb3045;p=kernel%2Fkernel-generic.git

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: Tim Bird <tim.bird@am.sony.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/android/logger.c b/drivers/staging/android/logger.c
index 1e9e638..6dd6f04 100644
--- a/drivers/staging/android/logger.c
+++ b/drivers/staging/android/logger.c
@@ -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)