diff options
| author | Vinicius Costa Gomes <vinicius.gomes@openbossa.org> | 2012-01-04 11:57:17 -0300 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-13 17:01:21 +0200 |
| commit | 1931782b67bd1b81007022e8311669c40bb7d5b1 (patch) | |
| tree | 7ab32be2e17a71dc242be4755899a55d6dd5368b | |
| parent | cc48dc0a996af6ae20e91c551d71e7f72768860f (diff) | |
| download | op-kernel-dev-1931782b67bd1b81007022e8311669c40bb7d5b1.zip op-kernel-dev-1931782b67bd1b81007022e8311669c40bb7d5b1.tar.gz | |
Bluetooth: Fix using an absolute timeout on hci_conn_put()
queue_delayed_work() expects a relative time for when that work
should be scheduled.
Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@openbossa.org>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index a8680da..25a6c3f 100644 --- a/include/net/bluetooth/hci_core.h +++ b/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); } } |
