[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <49FA604C020000BF000290B6@mailgw2.hevs.ch>
Date: Fri, 01 May 2009 02:37:00 +0200
From: "Marc Pignat" <Marc.Pignat@...s.ch>
To: <marcel@...tmann.org>, <jkosina@...e.cz>
Cc: <ext-roger.quadros@...ia.com>, <linux-bluetooth@...r.kernel.org>,
<linux-kernel@...r.kernel.org>
Subject: Re: [BUG] 2.6.30-rc4 hid bluetooth not working
Subject: bluetooth: Fix serialization when adding/deleting connections in hci_sysfs
add_conn and del_conn should be serialized, but flush_workqueue can't be used
by the worker thread on it's own queue, so use flush_work to serialize add_conn
and del_conn against each other.
Signed-off-by: Marc Pignat <marc.pignat@...s.ch>
---
patch against 2.6.30-rc4.
diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c
index b7c5108..42695e3 100644
--- a/net/bluetooth/hci_sysfs.c
+++ b/net/bluetooth/hci_sysfs.c
@@ -89,8 +89,8 @@ static void add_conn(struct work_struct *work)
{
struct hci_conn *conn = container_of(work, struct hci_conn, work_add);
- /* ensure previous add/del is complete */
- flush_workqueue(bluetooth);
+ /* ensure previous del is complete */
+ flush_work(&conn->work_del);
if (device_add(&conn->dev) < 0) {
BT_ERR("Failed to register connection device");
@@ -134,8 +134,8 @@ 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/del is complete */
- flush_workqueue(bluetooth);
+ /* ensure previous add is complete */
+ flush_work(&conn->work_add);
while (1) {
struct device *dev;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists