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/btbcm.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/btbcm.c')
| -rw-r--r-- | drivers/bluetooth/btbcm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c index 24f8c4e93f4e..9ab6cfbb831d 100644 --- a/drivers/bluetooth/btbcm.c +++ b/drivers/bluetooth/btbcm.c @@ -295,6 +295,7 @@ static const struct { { 0x410e, "BCM43341B0" }, /* 002.001.014 */ { 0x4406, "BCM4324B3" }, /* 002.004.006 */ { 0x610c, "BCM4354" }, /* 003.001.012 */ + { 0x2209, "BCM43430A1" }, /* 001.002.009 */ { } }; |