Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10c38c33 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6

parents 6942fec9 d9319560

drivers/bluetooth/hci_ldisc.c

+4 −2
Original line number Diff line number Diff line
@@ -311,11 +311,13 @@ 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);

			if (hdev) {

				hci_unregister_dev(hdev);

				hci_free_dev(hdev);

			}

		}

	}

}



/* hci_uart_tty_wakeup()

 *

net/bluetooth/rfcomm/core.c

+1 −0
Original line number Diff line number Diff line
@@ -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;