]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Bluetooth: Fix using an absolute timeout on hci_conn_put()
authorVinicius Costa Gomes <vinicius.gomes@openbossa.org>
Wed, 4 Jan 2012 14:57:17 +0000 (11:57 -0300)
committerJohan Hedberg <johan.hedberg@intel.com>
Wed, 15 Feb 2012 11:09:26 +0000 (13:09 +0200)
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>
include/net/bluetooth/hci_core.h

index ea9231f4935feba9ebd791e4d12287cc24284fd6..92b8fea553d7fdd536f390eaad7f8dcddc90976e 100644 (file)
@@ -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);
        }
 }