diff options
author | David S. Miller <davem@davemloft.net> | 2018-09-13 15:06:12 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-09-13 15:06:12 -0400 |
commit | bffb9b51a230e61cc3870f30cc158a8a003eb55f (patch) | |
tree | 671ee18bec29c6e18ce03d8aab30527174d3fc03 /drivers | |
parent | 79140335ac12e71d9270dabe030274a297d8a2cf (diff) | |
parent | e6a57d22f787e73635ce0d29eef0abb77928b3e9 (diff) |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Johan Hedberg says:
====================
pull request: bluetooth 2018-09-13
A few Bluetooth fixes for the 4.19-rc series:
- Fixed rw_semaphore leak in hci_ldisc
- Fixed local Out-of-Band pairing data handling
Let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/bluetooth/hci_ldisc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c index 963bb0309e25..ea6238ed5c0e 100644 --- a/drivers/bluetooth/hci_ldisc.c +++ b/drivers/bluetooth/hci_ldisc.c | |||
@@ -543,6 +543,8 @@ static void hci_uart_tty_close(struct tty_struct *tty) | |||
543 | } | 543 | } |
544 | clear_bit(HCI_UART_PROTO_SET, &hu->flags); | 544 | clear_bit(HCI_UART_PROTO_SET, &hu->flags); |
545 | 545 | ||
546 | percpu_free_rwsem(&hu->proto_lock); | ||
547 | |||
546 | kfree(hu); | 548 | kfree(hu); |
547 | } | 549 | } |
548 | 550 | ||