---

yaml --- r: 290843 b: refs/heads/master c: 1931782 h: refs/heads/master i: 290841: 51b59fb 290839: 9644ea0 v: v3
git-mirror · Feb 13, 2012 · 765ae58 · 765ae58
1 parent 9264386
commit 765ae58
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: cc48dc0a996af6ae20e91c551d71e7f72768860f
+refs/heads/master: 1931782b67bd1b81007022e8311669c40bb7d5b1
diff --git a/trunk/include/net/bluetooth/hci_core.h b/trunk/include/net/bluetooth/hci_core.h
@@ -588,7 +588,7 @@ static inline void hci_conn_put(struct hci_conn *conn)
 		}
 		cancel_delayed_work_sync(&conn->disc_work);
 		queue_delayed_work(conn->hdev->workqueue,
-					&conn->disc_work, jiffies + timeo);
+					&conn->disc_work, timeo);
 	}
 }