aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorDave Young <hidave.darkstar@gmail.com>2008-01-22 01:35:21 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-23 06:11:39 -0500
commitacea6852f32b8805e166d885ed7e9f0c7cd10d41 (patch)
tree515aefb6f5346d417933a6b8958d1052cea51f6a /net/bluetooth
parent667984d9e481e43a930a478c588dced98cb61fea (diff)
[BLUETOOTH]: Move children of connection device to NULL before connection down.
The rfcomm tty device will possibly retain even when conn is down, and sysfs doesn't support zombie device moving, so this patch move the tty device before conn device is destroyed. For the bug refered please see : http://lkml.org/lkml/2007/12/28/87 Signed-off-by: Dave Young <hidave.darkstar@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/hci_sysfs.c17
-rw-r--r--net/bluetooth/rfcomm/tty.c3
2 files changed, 19 insertions, 1 deletions
diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c
index cad510309dcf..17f7fb720553 100644
--- a/net/bluetooth/hci_sysfs.c
+++ b/net/bluetooth/hci_sysfs.c
@@ -316,9 +316,26 @@ void hci_conn_add_sysfs(struct hci_conn *conn)
316 schedule_work(&conn->work); 316 schedule_work(&conn->work);
317} 317}
318 318
319static int __match_tty(struct device *dev, void *data)
320{
321 /* The rfcomm tty device will possibly retain even when conn
322 * is down, and sysfs doesn't support move zombie device,
323 * so we should move the device before conn device is destroyed.
324 * Due to the only child device of hci_conn dev is rfcomm
325 * tty_dev, here just return 1
326 */
327 return 1;
328}
329
319static void del_conn(struct work_struct *work) 330static void del_conn(struct work_struct *work)
320{ 331{
332 struct device *dev;
321 struct hci_conn *conn = container_of(work, struct hci_conn, work); 333 struct hci_conn *conn = container_of(work, struct hci_conn, work);
334
335 while (dev = device_find_child(&conn->dev, NULL, __match_tty)) {
336 device_move(dev, NULL);
337 put_device(dev);
338 }
322 device_del(&conn->dev); 339 device_del(&conn->dev);
323 put_device(&conn->dev); 340 put_device(&conn->dev);
324} 341}
diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
index a6a758dd1f7d..788c70321858 100644
--- a/net/bluetooth/rfcomm/tty.c
+++ b/net/bluetooth/rfcomm/tty.c
@@ -696,7 +696,8 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
696 BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc, dev->opened); 696 BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc, dev->opened);
697 697
698 if (--dev->opened == 0) { 698 if (--dev->opened == 0) {
699 device_move(dev->tty_dev, NULL); 699 if (dev->tty_dev->parent)
700 device_move(dev->tty_dev, NULL);
700 701
701 /* Close DLC and dettach TTY */ 702 /* Close DLC and dettach TTY */
702 rfcomm_dlc_close(dev->dlc, 0); 703 rfcomm_dlc_close(dev->dlc, 0);