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 | |
| parent | 6942fec92d3d1b6918425730de31b4c6d0d5c196 (diff) | |
| parent | d9319560b86839506c2011346b1f2e61438a3c73 (diff) | |
| download | linux-stable-10c38c3306c04ec26b1536d30b8b11ccab32faa5.tar.gz linux-stable-10c38c3306c04ec26b1536d30b8b11ccab32faa5.tar.bz2 linux-stable-10c38c3306c04ec26b1536d30b8b11ccab32faa5.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
| -rw-r--r-- | drivers/bluetooth/hci_ldisc.c | 6 | ||||
| -rw-r--r-- | net/bluetooth/rfcomm/core.c | 1 |
2 files changed, 5 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) if (test_and_clear_bit(HCI_UART_PROTO_SET, &hu->flags)) { hu->proto->close(hu); - hci_unregister_dev(hdev); - hci_free_dev(hdev); + if (hdev) { + hci_unregister_dev(hdev); + hci_free_dev(hdev); + } } } } diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c index fa642aa652bd..432a9a633e8d 100644 --- a/net/bluetooth/rfcomm/core.c +++ b/net/bluetooth/rfcomm/core.c @@ -311,6 +311,7 @@ static void rfcomm_dlc_clear_state(struct rfcomm_dlc *d) d->state = BT_OPEN; d->flags = 0; d->mscex = 0; + d->sec_level = BT_SECURITY_LOW; d->mtu = RFCOMM_DEFAULT_MTU; d->v24_sig = RFCOMM_V24_RTC | RFCOMM_V24_RTR | RFCOMM_V24_DV; |