projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6e1da68
)
Bluetooth: Fix using an absolute timeout on hci_conn_put()
author
Vinicius Costa Gomes
<
[email protected]
>
Wed, 4 Jan 2012 14:57:17 +0000
(11:57 -0300)
committer
Johan Hedberg
<
[email protected]
>
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 <
[email protected]
>
Acked-by: Marcel Holtmann <
[email protected]
>
Signed-off-by: Johan Hedberg <
[email protected]
>
include/net/bluetooth/hci_core.h
patch
|
blob
|
history
diff --git
a/include/net/bluetooth/hci_core.h
b/include/net/bluetooth/hci_core.h
index ea9231f4935feba9ebd791e4d12287cc24284fd6..92b8fea553d7fdd536f390eaad7f8dcddc90976e 100644
(file)
--- 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);
}
}