diff options
| author | Dave Young <hidave.darkstar@gmail.com> | 2008-02-01 03:33:10 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-01 04:28:33 +0100 |
| commit | 5396c9356efec1d3d818b786f69e081aaad4b98b (patch) | |
| tree | e336503379e46e6e0f43795baf1ed91444ad69d5 | |
| parent | [TCP]: Unexport sysctl_tcp_tso_win_divisor (diff) | |
| download | linux-5396c9356efec1d3d818b786f69e081aaad4b98b.tar.xz linux-5396c9356efec1d3d818b786f69e081aaad4b98b.zip | |
[BLUETOOTH]: Fix bugs in previous conn add/del workqueue changes.
Jens Axboe noticed that we were queueing &conn->work on both btaddconn
and keventd_wq.
Signed-off-by: Dave Young <hidave.darkstar@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/bluetooth/hci_sysfs.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c index 2726adc419d3..e13cf5ef144c 100644 --- a/net/bluetooth/hci_sysfs.c +++ b/net/bluetooth/hci_sysfs.c @@ -282,6 +282,7 @@ static void add_conn(struct work_struct *work) int i; flush_workqueue(btdelconn); + if (device_add(&conn->dev) < 0) { BT_ERR("Failed to register connection device"); return; @@ -317,7 +318,6 @@ void hci_conn_add_sysfs(struct hci_conn *conn) INIT_WORK(&conn->work, add_conn); queue_work(btaddconn, &conn->work); - schedule_work(&conn->work); } static int __match_tty(struct device *dev, void *data) @@ -354,7 +354,6 @@ void hci_conn_del_sysfs(struct hci_conn *conn) INIT_WORK(&conn->work, del_conn); queue_work(btdelconn, &conn->work); - schedule_work(&conn->work); } int hci_register_sysfs(struct hci_dev *hdev) @@ -408,6 +407,7 @@ int __init bt_sysfs_init(void) err = -ENOMEM; goto out; } + btdelconn = create_singlethread_workqueue("btdelconn"); if (!btdelconn) { err = -ENOMEM; @@ -447,8 +447,12 @@ out: void bt_sysfs_cleanup(void) { destroy_workqueue(btaddconn); + destroy_workqueue(btdelconn); + class_destroy(bt_class); + bus_unregister(&bt_bus); + platform_device_unregister(bt_platform); } |