diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-04-09 23:47:49 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-04-09 23:47:49 +0400 |
| commit | 41833af713457fe92f432a7354bc690587652879 (patch) | |
| tree | 6f821f85bd33c1823d557d1482f8aa6216cde5b3 /drivers/bluetooth/hci_ldisc.c | |
| parent | f68e556e23d1a4176b563bcb25d8baf2c5313f91 (diff) | |
| parent | 66f3b913e68e8e62bd2f9499495eeb6cc81b2662 (diff) | |
| download | linux-41833af713457fe92f432a7354bc690587652879.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Diffstat (limited to 'drivers/bluetooth/hci_ldisc.c')
| -rw-r--r-- | drivers/bluetooth/hci_ldisc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c index fd5adb408f44..98a8c05d4f23 100644 --- a/drivers/bluetooth/hci_ldisc.c +++ b/drivers/bluetooth/hci_ldisc.c @@ -299,11 +299,11 @@ static void hci_uart_tty_close(struct tty_struct *tty) hci_uart_close(hdev); if (test_and_clear_bit(HCI_UART_PROTO_SET, &hu->flags)) { - hu->proto->close(hu); if (hdev) { hci_unregister_dev(hdev); hci_free_dev(hdev); } + hu->proto->close(hu); } kfree(hu); |