Commit acea6852 authored by Dave Young's avatar Dave Young Committed by David S. Miller

[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/87Signed-off-by: default avatarDave Young <hidave.darkstar@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 667984d9
...@@ -316,9 +316,26 @@ void hci_conn_add_sysfs(struct hci_conn *conn) ...@@ -316,9 +316,26 @@ void hci_conn_add_sysfs(struct hci_conn *conn)
schedule_work(&conn->work); schedule_work(&conn->work);
} }
static int __match_tty(struct device *dev, void *data)
{
/* The rfcomm tty device will possibly retain even when conn
* is down, and sysfs doesn't support move zombie device,
* so we should move the device before conn device is destroyed.
* Due to the only child device of hci_conn dev is rfcomm
* tty_dev, here just return 1
*/
return 1;
}
static void del_conn(struct work_struct *work) static void del_conn(struct work_struct *work)
{ {
struct device *dev;
struct hci_conn *conn = container_of(work, struct hci_conn, work); struct hci_conn *conn = container_of(work, struct hci_conn, work);
while (dev = device_find_child(&conn->dev, NULL, __match_tty)) {
device_move(dev, NULL);
put_device(dev);
}
device_del(&conn->dev); device_del(&conn->dev);
put_device(&conn->dev); put_device(&conn->dev);
} }
......
...@@ -696,6 +696,7 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp) ...@@ -696,6 +696,7 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc, dev->opened); BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc, dev->opened);
if (--dev->opened == 0) { if (--dev->opened == 0) {
if (dev->tty_dev->parent)
device_move(dev->tty_dev, NULL); device_move(dev->tty_dev, NULL);
/* Close DLC and dettach TTY */ /* Close DLC and dettach TTY */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment