aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Young <hidave.darkstar@gmail.com>2008-02-18 20:45:41 -0800
committerDavid S. Miller <davem@davemloft.net>2008-02-18 20:45:41 -0800
commit8ac62dc773c149d7b7124b4912b425842f905d3e (patch)
treefca71bee2c49e236496170dc21a5bd4e49f69309
parent0cd63c8089f0f6316df1393c3a93bdbc67ab314d (diff)
bluetooth: do not move child device other than rfcomm
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@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/bluetooth/hci_sysfs.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c
index 767756c8fbc..84360c117d4 100644
--- a/net/bluetooth/hci_sysfs.c
+++ b/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)