iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[BLUETOOTH]: put_device before device_del fix

Browse Source 
Because of workqueue delay, the put_device could be called before
device_del, so move it to del_conn.

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 2007-12-29 19:17:47 -08:00 committed by David S. Miller
parent 2072c228c9
commit 38b7da09cf
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/bluetooth/hci_conn.c
View File

@ -259,22 +259,14 @@ int hci_conn_del(struct hci_conn *conn)
} }
tasklet_disable(&hdev->tx_task); tasklet_disable(&hdev->tx_task);
hci_conn_del_sysfs(conn);
hci_conn_hash_del(hdev, conn); hci_conn_hash_del(hdev, conn);
if (hdev->notify) if (hdev->notify)
hdev->notify(hdev, HCI_NOTIFY_CONN_DEL); hdev->notify(hdev, HCI_NOTIFY_CONN_DEL);
tasklet_enable(&hdev->tx_task); tasklet_enable(&hdev->tx_task);
skb_queue_purge(&conn->data_q); skb_queue_purge(&conn->data_q);
hci_conn_del_sysfs(conn);
hci_dev_put(hdev); hci_dev_put(hdev);
/* will free via device release */
put_device(&conn->dev);
return 0; return 0;
} }

1
net/bluetooth/hci_sysfs.c
View File

@ -320,6 +320,7 @@ static void del_conn(struct work_struct *work)
{ {
struct hci_conn *conn = container_of(work, struct hci_conn, work); struct hci_conn *conn = container_of(work, struct hci_conn, work);
device_del(&conn->dev); device_del(&conn->dev);
put_device(&conn->dev);
} }
void hci_conn_del_sysfs(struct hci_conn *conn) void hci_conn_del_sysfs(struct hci_conn *conn)