Skip to content

Commit

Permalink
[BLUETOOTH]: put_device before device_del fix
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dave Young authored and David S. Miller committed Dec 30, 2007
1 parent 2072c22 commit 38b7da0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
10 changes: 1 addition & 9 deletions net/bluetooth/hci_conn.c
Original file line number Diff line number Diff line change
Expand Up @@ -259,22 +259,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;
}

Expand Down
1 change: 1 addition & 0 deletions net/bluetooth/hci_sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,7 @@ static void del_conn(struct work_struct *work)
{
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)
Expand Down

0 comments on commit 38b7da0

Please sign in to comment.