From 06b2e3630b3b2271a8c480a10329e8c837331ca9 Mon Sep 17 00:00:00 2001 From: Dave Young Date: Mon, 18 Feb 2008 20:45:41 -0800 Subject: [PATCH] --- yaml --- r: 85846 b: refs/heads/master c: 8ac62dc773c149d7b7124b4912b425842f905d3e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/bluetooth/hci_sysfs.c | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index bc667dc71f93..ac1d9f2ddfa2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0cd63c8089f0f6316df1393c3a93bdbc67ab314d +refs/heads/master: 8ac62dc773c149d7b7124b4912b425842f905d3e diff --git a/trunk/net/bluetooth/hci_sysfs.c b/trunk/net/bluetooth/hci_sysfs.c index 767756c8fbcf..84360c117d4e 100644 --- a/trunk/net/bluetooth/hci_sysfs.c +++ b/trunk/net/bluetooth/hci_sysfs.c @@ -320,15 +320,14 @@ void hci_conn_add_sysfs(struct hci_conn *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)