git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
[sfrench/cifs-2.6.git]
/
net
/
bluetooth
/
hci_sysfs.c
diff --git
a/net/bluetooth/hci_sysfs.c
b/net/bluetooth/hci_sysfs.c
index 1a1f916be44e258a853fcbf4d60483199c976c32..ed82796d4a0fe353a2ac8722221c479957c56907 100644
(file)
--- a/
net/bluetooth/hci_sysfs.c
+++ b/
net/bluetooth/hci_sysfs.c
@@
-140,7
+140,7
@@
static void del_conn(struct work_struct *work)
dev = device_find_child(&conn->dev, NULL, __match_tty);
if (!dev)
break;
- device_move(dev, NULL);
+ device_move(dev, NULL
, DPM_ORDER_DEV_LAST
);
put_device(dev);
}