---

yaml --- r: 256389 b: refs/heads/master c: 942ecc9 h: refs/heads/master i: 256387: 5732348 v: v3
git-mirror · Jun 30, 2011 · adb85fa · adb85fa
1 parent 0fe484e
commit adb85fa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 774e5651460ee7c688914fd76b6caa1675de355c
+refs/heads/master: 942ecc9c4643db5ce071562e0a23f99464d6b461
diff --git a/trunk/net/bluetooth/l2cap_core.c b/trunk/net/bluetooth/l2cap_core.c
@@ -225,7 +225,7 @@ static void l2cap_set_timer(struct l2cap_chan *chan, struct timer_list *timer, l
 {
 	BT_DBG("chan %p state %d timeout %ld", chan->sk, chan->state, timeout);
 
-	if (!mod_timer(timer, jiffies + timeout))
+	if (!mod_timer(timer, jiffies + msecs_to_jiffies(timeout)))
 		chan_hold(chan);
 }