From 50d495bdd217426544ef5ef0c1f6dfb6403d4c63 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 22 Aug 2007 14:01:37 -0700
Subject: [PATCH] --- yaml --- r: 64247 b: refs/heads/master c:
 179394af7a2baa1d0a3cb1670075310d72247d38 h: refs/heads/master i:   64245:
 451f175b219c7902cff6cb60135d79255183de0a   64243:
 658f3f647f798a3764e13b0b145b8f78f83a4c1b   64239:
 bd5ac288bf2e7c8b3c8990078af3700c2a7640a7 v: v3

---
 [refs]                      | 2 +-
 trunk/kernel/posix-timers.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b61605d26da3..96b294c90246 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 928923c76b393e38e5ba1d47e843e208ceef6cf9
+refs/heads/master: 179394af7a2baa1d0a3cb1670075310d72247d38
diff --git a/trunk/kernel/posix-timers.c b/trunk/kernel/posix-timers.c
index 55b3761edaa9..6923ad8a5983 100644
--- a/trunk/kernel/posix-timers.c
+++ b/trunk/kernel/posix-timers.c
@@ -605,13 +605,14 @@ static struct k_itimer * lock_timer(timer_t timer_id, unsigned long *flags)
 	timr = (struct k_itimer *) idr_find(&posix_timers_id, (int) timer_id);
 	if (timr) {
 		spin_lock(&timr->it_lock);
-		spin_unlock(&idr_lock);
 
 		if ((timr->it_id != timer_id) || !(timr->it_process) ||
 				timr->it_process->tgid != current->tgid) {
-			unlock_timer(timr, *flags);
+			spin_unlock(&timr->it_lock);
+			spin_unlock_irqrestore(&idr_lock, *flags);
 			timr = NULL;
-		}
+		} else
+			spin_unlock(&idr_lock);
 	} else
 		spin_unlock_irqrestore(&idr_lock, *flags);