summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorVinicius Costa Gomes <vinicius.gomes@openbossa.org>2012-01-04 11:57:17 -0300
committerJohan Hedberg <johan.hedberg@intel.com>2012-02-15 13:09:26 +0200
commit331660637b4e5136602a98200a84f6b65ed8d5be (patch)
tree0fe6f4a3bd4ba98855b039af5a4c066d50ac7cc7 /include
parent6e1da683f79a22fafaada62d547138daaa9e3456 (diff)
downloadlinux-331660637b4e5136602a98200a84f6b65ed8d5be.tar.gz
linux-331660637b4e5136602a98200a84f6b65ed8d5be.tar.bz2
linux-331660637b4e5136602a98200a84f6b65ed8d5be.zip
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>
Diffstat (limited to 'include')
-rw-r--r--include/net/bluetooth/hci_core.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index ea9231f4935f..92b8fea553d7 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -561,7 +561,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);
}
}