diff options
| author | David S. Miller <davem@davemloft.net> | 2019-03-02 13:55:36 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-03-02 13:55:36 -0800 |
| commit | 2369afb6696c5a53772bfbc8b57b75dd40e46bfc (patch) | |
| tree | 182b849e356af91e15964e4bb3fde47579b2f117 /drivers/bluetooth/hci_ldisc.c | |
| parent | 9eb359140cd307f8a14f61c19b155ffca5291057 (diff) | |
| parent | 22eaf6c9946ae269061d95bb9ceee02524166474 (diff) | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2019-03-02
Here's one more bluetooth-next pull request for the 5.1 kernel:
- Added support for MediaTek MT7663U and MT7668U UART devices
- Cleanups & fixes to the hci_qca driver
- Fixed wakeup pin behavior for QCA6174A controller
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/bluetooth/hci_ldisc.c')
| -rw-r--r-- | drivers/bluetooth/hci_ldisc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c index 4918fefc4a6f..9562e72c1ae5 100644 --- a/drivers/bluetooth/hci_ldisc.c +++ b/drivers/bluetooth/hci_ldisc.c @@ -696,14 +696,13 @@ static int hci_uart_set_proto(struct hci_uart *hu, int id) return -EPROTONOSUPPORT; hu->proto = p; - set_bit(HCI_UART_PROTO_READY, &hu->flags); err = hci_uart_register_dev(hu); if (err) { - clear_bit(HCI_UART_PROTO_READY, &hu->flags); return err; } + set_bit(HCI_UART_PROTO_READY, &hu->flags); return 0; } |