diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-12-13 14:41:23 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-12-13 14:41:23 -0500 |
| commit | 10c38c3306c04ec26b1536d30b8b11ccab32faa5 (patch) | |
| tree | 3aada0b8d12cb8d67c88fa39c4ad71ac7b2cef27 /drivers | |
| parent | 6942fec92d3d1b6918425730de31b4c6d0d5c196 (diff) | |
| parent | d9319560b86839506c2011346b1f2e61438a3c73 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/bluetooth/hci_ldisc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c index 720148294e64..3c6cabcb7d84 100644 --- a/drivers/bluetooth/hci_ldisc.c +++ b/drivers/bluetooth/hci_ldisc.c | |||
| @@ -311,8 +311,10 @@ static void hci_uart_tty_close(struct tty_struct *tty) | |||
| 311 | 311 | ||
| 312 | if (test_and_clear_bit(HCI_UART_PROTO_SET, &hu->flags)) { | 312 | if (test_and_clear_bit(HCI_UART_PROTO_SET, &hu->flags)) { |
| 313 | hu->proto->close(hu); | 313 | hu->proto->close(hu); |
| 314 | hci_unregister_dev(hdev); | 314 | if (hdev) { |
| 315 | hci_free_dev(hdev); | 315 | hci_unregister_dev(hdev); |
| 316 | hci_free_dev(hdev); | ||
| 317 | } | ||
| 316 | } | 318 | } |
| 317 | } | 319 | } |
| 318 | } | 320 | } |