提交 c893779e 编写于 作者: M Marcel Holtmann 提交者: David S. Miller

[Bluetooth] Handle device registration failures

In the case the device registration for a new Bluetooth low-level
connection fails there is no need to unregister it when the temporary
data structure has been removed.
Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
上级 4d6a2188
...@@ -242,7 +242,7 @@ static void add_conn(struct work_struct *work) ...@@ -242,7 +242,7 @@ static void add_conn(struct work_struct *work)
struct hci_conn *conn = container_of(work, struct hci_conn, work); struct hci_conn *conn = container_of(work, struct hci_conn, work);
int i; int i;
if (device_register(&conn->dev) < 0) { if (device_add(&conn->dev) < 0) {
BT_ERR("Failed to register connection device"); BT_ERR("Failed to register connection device");
return; return;
} }
...@@ -272,6 +272,8 @@ void hci_conn_add_sysfs(struct hci_conn *conn) ...@@ -272,6 +272,8 @@ void hci_conn_add_sysfs(struct hci_conn *conn)
dev_set_drvdata(&conn->dev, conn); dev_set_drvdata(&conn->dev, conn);
device_initialize(&conn->dev);
INIT_WORK(&conn->work, add_conn); INIT_WORK(&conn->work, add_conn);
schedule_work(&conn->work); schedule_work(&conn->work);
...@@ -287,6 +289,9 @@ void hci_conn_del_sysfs(struct hci_conn *conn) ...@@ -287,6 +289,9 @@ void hci_conn_del_sysfs(struct hci_conn *conn)
{ {
BT_DBG("conn %p", conn); BT_DBG("conn %p", conn);
if (!device_is_registered(&conn->dev))
return;
INIT_WORK(&conn->work, del_conn); INIT_WORK(&conn->work, del_conn);
schedule_work(&conn->work); schedule_work(&conn->work);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册