diff options
| author | James Morris <jmorris@namei.org> | 2009-03-26 17:28:11 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-03-26 17:28:11 -0400 |
| commit | 1987f17d2266e882862528841429b5bf67bc8fe5 (patch) | |
| tree | 5c3fbee88018ab7259a18c10e6320e575d0ed679 /net/bluetooth/hci_sysfs.c | |
| parent | 7198e2eeb44b3fe7cc97f997824002da47a9c644 (diff) | |
| parent | 0384e2959127a56d0640505d004d8dd92f9c29f5 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'net/bluetooth/hci_sysfs.c')
| -rw-r--r-- | net/bluetooth/hci_sysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c index 1a1f916be44e..ed82796d4a0f 100644 --- a/net/bluetooth/hci_sysfs.c +++ b/net/bluetooth/hci_sysfs.c | |||
| @@ -140,7 +140,7 @@ static void del_conn(struct work_struct *work) | |||
| 140 | dev = device_find_child(&conn->dev, NULL, __match_tty); | 140 | dev = device_find_child(&conn->dev, NULL, __match_tty); |
| 141 | if (!dev) | 141 | if (!dev) |
| 142 | break; | 142 | break; |
| 143 | device_move(dev, NULL); | 143 | device_move(dev, NULL, DPM_ORDER_DEV_LAST); |
| 144 | put_device(dev); | 144 | put_device(dev); |
| 145 | } | 145 | } |
| 146 | 146 | ||