CHROMEOS: HACK: Work around bluetooth kernel panic.

[cascardo/linux.git] / net / bluetooth / hci_sysfs.c

diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c
index 55cceee..207f8d3 100644 (file)
--- a/net/bluetooth/hci_sysfs.c
+++ b/net/bluetooth/hci_sysfs.c
@@ -6,6 +6,7 @@
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
 
+static int acl_conn_index;
 static struct class *bt_class;
 
 struct dentry *bt_debugfs;
@@ -117,7 +118,9 @@ void hci_conn_add_sysfs(struct hci_conn *conn)
 
        BT_DBG("conn %p", conn);
 
-       dev_set_name(&conn->dev, "%s:%d", hdev->name, conn->handle);
+       acl_conn_index++;
+       dev_set_name(&conn->dev, "%s:%d:%d", hdev->name, conn->handle,
+                    acl_conn_index);
 
        if (device_add(&conn->dev) < 0) {
                BT_ERR("Failed to register connection device");