Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 39695
b: refs/heads/master
c: df5c37e
h: refs/heads/master
i:
  39693: 2416a36
  39691: 9a9a74a
  39687: 9193ff7
  39679: 1d66859
v: v3
  • Loading branch information
Marcel Holtmann authored and David S. Miller committed Oct 16, 2006
1 parent a4eff96 commit 219f455
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e9c5702e3c5558dade169949abd730173e87ef9c
refs/heads/master: df5c37ea9a3820a9515d8204450aec00f48f8f88
11 changes: 8 additions & 3 deletions trunk/net/bluetooth/hci_sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -242,10 +242,14 @@ static void add_conn(void *data)
struct hci_conn *conn = data;
int i;

device_register(&conn->dev);
if (device_register(&conn->dev) < 0) {
BT_ERR("Failed to register connection device");
return;
}

for (i = 0; conn_attrs[i]; i++)
device_create_file(&conn->dev, conn_attrs[i]);
if (device_create_file(&conn->dev, conn_attrs[i]) < 0)
BT_ERR("Failed to create connection attribute");
}

void hci_conn_add_sysfs(struct hci_conn *conn)
Expand Down Expand Up @@ -312,7 +316,8 @@ int hci_register_sysfs(struct hci_dev *hdev)
return err;

for (i = 0; bt_attrs[i]; i++)
device_create_file(dev, bt_attrs[i]);
if (device_create_file(dev, bt_attrs[i]) < 0)
BT_ERR("Failed to create device attribute");

return 0;
}
Expand Down
3 changes: 2 additions & 1 deletion trunk/net/bluetooth/l2cap.c
Original file line number Diff line number Diff line change
Expand Up @@ -2216,7 +2216,8 @@ static int __init l2cap_init(void)
goto error;
}

class_create_file(bt_class, &class_attr_l2cap);
if (class_create_file(bt_class, &class_attr_l2cap) < 0)
BT_ERR("Failed to create L2CAP info file");

BT_INFO("L2CAP ver %s", VERSION);
BT_INFO("L2CAP socket layer initialized");
Expand Down
3 changes: 2 additions & 1 deletion trunk/net/bluetooth/rfcomm/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -2058,7 +2058,8 @@ static int __init rfcomm_init(void)

kernel_thread(rfcomm_run, NULL, CLONE_KERNEL);

class_create_file(bt_class, &class_attr_rfcomm_dlc);
if (class_create_file(bt_class, &class_attr_rfcomm_dlc) < 0)
BT_ERR("Failed to create RFCOMM info file");

rfcomm_init_sockets();

Expand Down
3 changes: 2 additions & 1 deletion trunk/net/bluetooth/rfcomm/sock.c
Original file line number Diff line number Diff line change
Expand Up @@ -944,7 +944,8 @@ int __init rfcomm_init_sockets(void)
if (err < 0)
goto error;

class_create_file(bt_class, &class_attr_rfcomm);
if (class_create_file(bt_class, &class_attr_rfcomm) < 0)
BT_ERR("Failed to create RFCOMM info file");

BT_INFO("RFCOMM socket layer initialized");

Expand Down
3 changes: 2 additions & 1 deletion trunk/net/bluetooth/sco.c
Original file line number Diff line number Diff line change
Expand Up @@ -967,7 +967,8 @@ static int __init sco_init(void)
goto error;
}

class_create_file(bt_class, &class_attr_sco);
if (class_create_file(bt_class, &class_attr_sco) < 0)
BT_ERR("Failed to create SCO info file");

BT_INFO("SCO (Voice Link) ver %s", VERSION);
BT_INFO("SCO socket layer initialized");
Expand Down

0 comments on commit 219f455

Please sign in to comment.