From 765ae58e1a77e1c0a598f198f5c81bfab51e1b96 Mon Sep 17 00:00:00 2001 From: Vinicius Costa Gomes Date: Wed, 4 Jan 2012 11:57:17 -0300 Subject: [PATCH] --- yaml --- r: 290843 b: refs/heads/master c: 1931782b67bd1b81007022e8311669c40bb7d5b1 h: refs/heads/master i: 290841: 51b59fb91e109ed4294814d4c655e0e0ae328e5a 290839: 9644ea0191cd183cbdd0a296fde24ed88cc23c82 v: v3 --- [refs] | 2 +- trunk/include/net/bluetooth/hci_core.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 03e724de9563..6f8942e6bbe6 100644 --- 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 index a8680da7f400..25a6c3fd7d1a 100644 --- 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); } }