The patch titled bluetooth: do not move child device other than rfcomm has been removed from the -mm tree. Its filename was bluetooth-do-not-move-child-device-other-than-rfcomm.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: bluetooth: do not move child device other than rfcomm From: Dave Young <hidave.darkstar@xxxxxxxxx> hci conn child devices other than rfcomm tty should not be moved here. This is my lost, thanks for Barnaby's reporting and testing. Signed-off-by: Dave Young <hidave.darkstar@xxxxxxxxx> Cc: Marcel Holtmann <marcel@holt Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- net/bluetooth/hci_sysfs.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff -puN net/bluetooth/hci_sysfs.c~bluetooth-do-not-move-child-device-other-than-rfcomm net/bluetooth/hci_sysfs.c --- a/net/bluetooth/hci_sysfs.c~bluetooth-do-not-move-child-device-other-than-rfcomm +++ a/net/bluetooth/hci_sysfs.c @@ -320,15 +320,14 @@ void hci_conn_add_sysfs(struct hci_conn queue_work(btaddconn, &conn->work); } +/* + * The rfcomm tty device will possibly retain even when conn + * is down, and sysfs doesn't support move zombie device, + * so we should move the device before conn device is destroyed. + */ static int __match_tty(struct device *dev, void *data) { - /* The rfcomm tty device will possibly retain even when conn - * is down, and sysfs doesn't support move zombie device, - * so we should move the device before conn device is destroyed. - * Due to the only child device of hci_conn dev is rfcomm - * tty_dev, here just return 1 - */ - return 1; + return !strncmp(dev->bus_id, "rfcomm", 6); } static void del_conn(struct work_struct *work) _ Patches currently in -mm which might be from hidave.darkstar@xxxxxxxxx are origin.patch bluetooth-make-hci_sock_cleanup-return-void.patch bluetooth-hci_core-defer-hci_unregister_sysfs.patch bluetooth-conwise-technology-based-adapters-with-buggy-sco-support-bugzilla-9027.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html