X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=kernel%2Frtmutex.c;h=69d9cb921ffa657ef6939be6dcfb053570fb019f;hb=db7aa1c203d477351ed1b8f394b40d9df06ddfc4;hp=0deef71ff8d2a7444f74af1904b11b93e2a86766;hpb=43cd73658d8077ee6899b0b5029aad0cba1e9f92;p=pandora-kernel.git

diff --git a/kernel/rtmutex.c b/kernel/rtmutex.c
index 0deef71ff8d2..69d9cb921ffa 100644
--- a/kernel/rtmutex.c
+++ b/kernel/rtmutex.c
@@ -630,9 +630,11 @@ rt_mutex_slowlock(struct rt_mutex *lock, int state,
 	set_current_state(state);
 
 	/* Setup the timer, when timeout != NULL */
-	if (unlikely(timeout))
-		hrtimer_start(&timeout->timer, timeout->timer.expires,
-			      HRTIMER_MODE_ABS);
+	if (unlikely(timeout)) {
+		hrtimer_start_expires(&timeout->timer, HRTIMER_MODE_ABS);
+		if (!hrtimer_active(&timeout->timer))
+			timeout->task = NULL;
+	}
 
 	for (;;) {
 		/* Try to acquire the lock: */