From 516518858ab35d8b54f8833c40814fd93c3fc8cf Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Fri, 8 Jun 2007 13:46:57 -0700
Subject: [PATCH] --- yaml --- r: 57475 b: refs/heads/master c:
 c0d1d2bf5a28f78def7b68ca1eb5ba31aafd43a1 h: refs/heads/master i:   57473:
 2b90c676f556b3128627075c61f0d12842bd8bc9   57471:
 e52d192fd95f1602bf5b6b5d72b516f65a15f6a4 v: v3

---
 [refs]                 |  2 +-
 trunk/kernel/rtmutex.c | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f80f3e14d6f7..49d1158887ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51b94d2a5a90d4800e74d7348bcde098a28f4fb3
+refs/heads/master: c0d1d2bf5a28f78def7b68ca1eb5ba31aafd43a1
diff --git a/trunk/kernel/rtmutex.c b/trunk/kernel/rtmutex.c
index 12879f6c1ec3..a273183c37a0 100644
--- a/trunk/kernel/rtmutex.c
+++ b/trunk/kernel/rtmutex.c
@@ -636,9 +636,16 @@ rt_mutex_slowlock(struct rt_mutex *lock, int state,
 			 * all over without going into schedule to try
 			 * to get the lock now:
 			 */
-			if (unlikely(!waiter.task))
+			if (unlikely(!waiter.task)) {
+				/*
+				 * Reset the return value. We might
+				 * have returned with -EDEADLK and the
+				 * owner released the lock while we
+				 * were walking the pi chain.
+				 */
+				ret = 0;
 				continue;
-
+			}
 			if (unlikely(ret))
 				break;
 		}