UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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>
This commit is contained in:
Dave Young 2008-01-31 18:33:10 -08:00 committed by David S. Miller
parent 30a50cc566
commit 5396c9356e
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/bluetooth/hci_sysfs.c
View File

@ -282,6 +282,7 @@ static void add_conn(struct work_struct *work)
int i; int i;
flush_workqueue(btdelconn); flush_workqueue(btdelconn);
if (device_add(&conn->dev) < 0) { if (device_add(&conn->dev) < 0) {
BT_ERR("Failed to register connection device"); BT_ERR("Failed to register connection device");
return; return;
@ -317,7 +318,6 @@ void hci_conn_add_sysfs(struct hci_conn *conn)
INIT_WORK(&conn->work, add_conn); INIT_WORK(&conn->work, add_conn);
queue_work(btaddconn, &conn->work); queue_work(btaddconn, &conn->work);
schedule_work(&conn->work);
} }
static int __match_tty(struct device *dev, void *data) 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); INIT_WORK(&conn->work, del_conn);
queue_work(btdelconn, &conn->work); queue_work(btdelconn, &conn->work);
schedule_work(&conn->work);
} }
int hci_register_sysfs(struct hci_dev *hdev) int hci_register_sysfs(struct hci_dev *hdev)
@ -408,6 +407,7 @@ int __init bt_sysfs_init(void)
err = -ENOMEM; err = -ENOMEM;
goto out; goto out;
} }
btdelconn = create_singlethread_workqueue("btdelconn"); btdelconn = create_singlethread_workqueue("btdelconn");
if (!btdelconn) { if (!btdelconn) {
err = -ENOMEM; err = -ENOMEM;
@ -447,8 +447,12 @@ out:
void bt_sysfs_cleanup(void) void bt_sysfs_cleanup(void)
{ {
destroy_workqueue(btaddconn); destroy_workqueue(btaddconn);
destroy_workqueue(btdelconn); destroy_workqueue(btdelconn);
class_destroy(bt_class); class_destroy(bt_class);
bus_unregister(&bt_bus); bus_unregister(&bt_bus);
platform_device_unregister(bt_platform); platform_device_unregister(bt_platform);
} }