[BUG][PATCH] bluetooth: put_device before device_del fix

Dave Young
2007-12-27T05:27:50Z

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>

---
net/bluetooth/hci_conn.c | 10 +---------
net/bluetooth/hci_sysfs.c | 1 +
2 files changed, 2 insertions(+), 9 deletions(-)

diff -upr linux/net/bluetooth/hci_conn.c linux.new/net/bluetooth/hci_conn.c
--- linux/net/bluetooth/hci_conn.c 2007-12-27 13:12:48.000000000 +0800
+++ linux.new/net/bluetooth/hci_conn.c 2007-12-27 13:17:50.000000000 +0800
@@ -254,22 +254,14 @@ int hci_conn_del(struct hci_conn *conn)
}

tasklet_disable(&hdev->tx_task);
-
- hci_conn_del_sysfs(conn);
-
hci_conn_hash_del(hdev, conn);
if (hdev->notify)
hdev->notify(hdev, HCI_NOTIFY_CONN_DEL);
-
tasklet_enable(&hdev->tx_task);
-
skb_queue_purge(&conn->data_q);
-
+ hci_conn_del_sysfs(conn);
hci_dev_put(hdev);

- /* will free via device release */
- put_device(&conn->dev);
-
return 0;
}

diff -upr linux/net/bluetooth/hci_sysfs.c linux.new/net/bluetooth/hci_sysfs.c
--- linux/net/bluetooth/hci_sysfs.c 2007-12-27 13:12:48.000000000 +0800
+++ linux.new/net/bluetooth/hci_sysfs.c 2007-12-27 13:14:06.000000000 +0800
@@ -320,6 +320,7 @@ static void del_conn(struct work_struct
{
struct hci_conn *conn = container_of(work, struct hci_conn, work);
device_del(&conn->dev);
+ put_device(&conn->dev);
}

void hci_conn_del_sysfs(struct hci_conn *conn)