diff options
| author | David S. Miller <davem@davemloft.net> | 2017-07-02 01:57:29 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-07-02 01:57:29 +0300 |
| commit | 57a53a0b6788e1e3e660987e3771837efa90d980 (patch) | |
| tree | fde7f92405fa936b3ef0540b7c8f60241d1d6fa0 /drivers/bluetooth/hci_serdev.c | |
| parent | 2cb5c8e378d10a57aa1c9eaee36bea46c27dd2b9 (diff) | |
| parent | feb16722b5d5f05b7ae1278a43e717c3d35cd512 (diff) | |
| download | linux-57a53a0b6788e1e3e660987e3771837efa90d980.tar.xz | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2017-07-01
Here are some more Bluetooth patches for the 4.13 kernel:
- Added support for Broadcom BCM43430 controllers
- Added sockaddr length checks before accessing sa_family
- Fixed possible "might sleep" errors in bnep, cmtp and hidp modules
- A few other minor fixes
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_serdev.c')
| -rw-r--r-- | drivers/bluetooth/hci_serdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/bluetooth/hci_serdev.c b/drivers/bluetooth/hci_serdev.c index 7de0edc0ff8c..aea930101dd2 100644 --- a/drivers/bluetooth/hci_serdev.c +++ b/drivers/bluetooth/hci_serdev.c @@ -31,7 +31,7 @@ #include "hci_uart.h" -struct serdev_device_ops hci_serdev_client_ops; +static struct serdev_device_ops hci_serdev_client_ops; static inline void hci_uart_tx_complete(struct hci_uart *hu, int pkt_type) { @@ -268,7 +268,7 @@ static int hci_uart_receive_buf(struct serdev_device *serdev, const u8 *data, return count; } -struct serdev_device_ops hci_serdev_client_ops = { +static struct serdev_device_ops hci_serdev_client_ops = { .receive_buf = hci_uart_receive_buf, .write_wakeup = hci_uart_write_wakeup, }; |