diff options
Diffstat (limited to 'net/bluetooth/rfcomm/tty.c')
-rw-r--r-- | net/bluetooth/rfcomm/tty.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c index d030c69cb5a3..abdc703a11d2 100644 --- a/net/bluetooth/rfcomm/tty.c +++ b/net/bluetooth/rfcomm/tty.c | |||
@@ -731,7 +731,8 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp) | |||
731 | remove_wait_queue(&dev->wait, &wait); | 731 | remove_wait_queue(&dev->wait, &wait); |
732 | 732 | ||
733 | if (err == 0) | 733 | if (err == 0) |
734 | device_move(dev->tty_dev, rfcomm_get_device(dev)); | 734 | device_move(dev->tty_dev, rfcomm_get_device(dev), |
735 | DPM_ORDER_DEV_AFTER_PARENT); | ||
735 | 736 | ||
736 | rfcomm_tty_copy_pending(dev); | 737 | rfcomm_tty_copy_pending(dev); |
737 | 738 | ||
@@ -751,7 +752,7 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp) | |||
751 | 752 | ||
752 | if (atomic_dec_and_test(&dev->opened)) { | 753 | if (atomic_dec_and_test(&dev->opened)) { |
753 | if (dev->tty_dev->parent) | 754 | if (dev->tty_dev->parent) |
754 | device_move(dev->tty_dev, NULL); | 755 | device_move(dev->tty_dev, NULL, DPM_ORDER_DEV_LAST); |
755 | 756 | ||
756 | /* Close DLC and dettach TTY */ | 757 | /* Close DLC and dettach TTY */ |
757 | rfcomm_dlc_close(dev->dlc, 0); | 758 | rfcomm_dlc_close(dev->dlc, 0); |