Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc23ffe0 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6

parents cf9f6e21 4c713189

net/bluetooth/hci_sysfs.c

+0 −6
Original line number Diff line number Diff line
@@ -90,9 +90,6 @@ static void add_conn(struct work_struct *work) 
	struct hci_conn *conn = container_of(work, struct hci_conn, work_add);

	struct hci_dev *hdev = conn->hdev;



	/* ensure previous del is complete */

	flush_work(&conn->work_del);



	dev_set_name(&conn->dev, "%s:%d", hdev->name, conn->handle);



	if (device_add(&conn->dev) < 0) {
@@ -118,9 +115,6 @@ static void del_conn(struct work_struct *work) 
	struct hci_conn *conn = container_of(work, struct hci_conn, work_del);

	struct hci_dev *hdev = conn->hdev;



	/* ensure previous add is complete */

	flush_work(&conn->work_add);



	if (!device_is_registered(&conn->dev))

		return;