---

yaml --- r: 288917 b: refs/heads/master c: c76c7ca h: refs/heads/master i: 288915: 8191296 v: v3
git-mirror · Feb 9, 2012 · 6892688 · 6892688
1 parent a91bf41
commit 6892688
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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)