diff options
author | Dave Young <hidave.darkstar@gmail.com> | 2008-01-22 01:35:21 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-23 06:11:39 -0500 |
commit | acea6852f32b8805e166d885ed7e9f0c7cd10d41 (patch) | |
tree | 515aefb6f5346d417933a6b8958d1052cea51f6a /net/bluetooth/rfcomm | |
parent | 667984d9e481e43a930a478c588dced98cb61fea (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/rfcomm')
-rw-r--r-- | net/bluetooth/rfcomm/tty.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); |