diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-01 14:32:08 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-01 14:32:08 -0700 |
| commit | fc23ffe075365d2f21b1046048ad0d342bbb41be (patch) | |
| tree | 164889c120908fbfeae36790f7bbee0271a30873 /net | |
| parent | cf9f6e21c155d5add733b969c695837ead79eeab (diff) | |
| parent | 4c713189485dbea875aecd1990daed74908e181d (diff) | |
| download | linux-fc23ffe075365d2f21b1046048ad0d342bbb41be.tar.gz linux-fc23ffe075365d2f21b1046048ad0d342bbb41be.tar.bz2 linux-fc23ffe075365d2f21b1046048ad0d342bbb41be.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
Diffstat (limited to 'net')
| -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) struct hci_conn *conn = container_of(work, struct hci_conn, work_add); struct hci_dev *hdev = conn->hdev; - /* ensure previous del is complete */ - flush_work(&conn->work_del); - dev_set_name(&conn->dev, "%s:%d", hdev->name, conn->handle); if (device_add(&conn->dev) < 0) { @@ -118,9 +115,6 @@ static void del_conn(struct work_struct *work) struct hci_conn *conn = container_of(work, struct hci_conn, work_del); struct hci_dev *hdev = conn->hdev; - /* ensure previous add is complete */ - flush_work(&conn->work_add); - if (!device_is_registered(&conn->dev)) return; |