]> git.karo-electronics.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>
Mon, 13 Feb 2012 15:01:21 +0000 (17:01 +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 a8680da7f40011fce5c7222509147b3e8d012490..25a6c3fd7d1a465a4843a405fa68ec4c136dc0e4 100644 (file)
@@ -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);
        }
 }