From 689268835d8675d30ef00fe9b2a6ee0fa91ad2e5 Mon Sep 17 00:00:00 2001
From: Tim Bird <tim.bird@am.sony.com>
Date: Tue, 7 Feb 2012 18:30:09 -0800
Subject: [PATCH] --- yaml --- r: 288917 b: refs/heads/master c:
 c76c7ca31f16c9556cad527bfa3504b0aafb3045 h: refs/heads/master i:   288915:
 81912960491ddebececf49d2768acbb323cd2629 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/staging/android/logger.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1fd079a10990..c8379b182b69 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3bcfa431334d99fa8bff96c4e7c2108f0b26242e
+refs/heads/master: c76c7ca31f16c9556cad527bfa3504b0aafb3045
diff --git a/trunk/drivers/staging/android/logger.c b/trunk/drivers/staging/android/logger.c
index 1e9e638cfd7a..6dd6f0490c3a 100644
--- a/trunk/drivers/staging/android/logger.c
+++ b/trunk/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)