-stable review patch. If anyone has any objections, please let us know. --------------------- From: Dave Young Jens Axboe noticed that we were queueing &conn->work on both btaddconn and keventd_wq. Signed-off-by: Dave Young Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman Signed-off-by: Chris Wright --- net/bluetooth/hci_sysfs.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) --- a/net/bluetooth/hci_sysfs.c +++ b/net/bluetooth/hci_sysfs.c @@ -282,6 +282,7 @@ static void add_conn(struct work_struct 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 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 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); } -- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/