diff options
| -rw-r--r-- | net/bluetooth/hci_sysfs.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c index 4cc3624bd22d..95f7a7a544b4 100644 --- a/net/bluetooth/hci_sysfs.c +++ b/net/bluetooth/hci_sysfs.c | |||
| @@ -90,9 +90,6 @@ static void add_conn(struct work_struct *work) | |||
| 90 | struct hci_conn *conn = container_of(work, struct hci_conn, work_add); | 90 | struct hci_conn *conn = container_of(work, struct hci_conn, work_add); |
| 91 | struct hci_dev *hdev = conn->hdev; | 91 | struct hci_dev *hdev = conn->hdev; |
| 92 | 92 | ||
| 93 | /* ensure previous del is complete */ | ||
| 94 | flush_work(&conn->work_del); | ||
| 95 | |||
| 96 | dev_set_name(&conn->dev, "%s:%d", hdev->name, conn->handle); | 93 | dev_set_name(&conn->dev, "%s:%d", hdev->name, conn->handle); |
| 97 | 94 | ||
| 98 | if (device_add(&conn->dev) < 0) { | 95 | if (device_add(&conn->dev) < 0) { |
| @@ -118,9 +115,6 @@ static void del_conn(struct work_struct *work) | |||
| 118 | struct hci_conn *conn = container_of(work, struct hci_conn, work_del); | 115 | struct hci_conn *conn = container_of(work, struct hci_conn, work_del); |
| 119 | struct hci_dev *hdev = conn->hdev; | 116 | struct hci_dev *hdev = conn->hdev; |
| 120 | 117 | ||
| 121 | /* ensure previous add is complete */ | ||
| 122 | flush_work(&conn->work_add); | ||
| 123 | |||
| 124 | if (!device_is_registered(&conn->dev)) | 118 | if (!device_is_registered(&conn->dev)) |
| 125 | return; | 119 | return; |
| 126 | 120 | ||
