From: Vinicius Costa Gomes <vinicius.gomes@openbossa.org>
Date: Wed, 4 Jan 2012 14:57:17 +0000 (-0300)
Subject: Bluetooth: Fix using an absolute timeout on hci_conn_put()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1931782b67bd1b81007022e8311669c40bb7d5b1;p=linux-beck.git

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>
---

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index a8680da7f400..25a6c3fd7d1a 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);
 	}
 }