diff options
| author | David S. Miller <davem@davemloft.net> | 2018-02-15 23:43:49 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-02-15 23:43:49 +0300 |
| commit | 35ed663f5f4f70dd750ea3e0166c5b90db9feea3 (patch) | |
| tree | 2cc217538ab719f62195181a7e67155605ed8e61 /drivers/bluetooth/btmrvl_main.c | |
| parent | ddd0010392d9cbcb95b53d11b7cafc67b373ab56 (diff) | |
| parent | 907f84990924bf3a8d248c040dabeb5127ae6938 (diff) | |
| download | linux-35ed663f5f4f70dd750ea3e0166c5b90db9feea3.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 2018-02-15
Here's the first bluetooth-next pull request targetting the 4.17 kernel
release.
- Fixes & cleanups to Atheros and Marvell drivers
- Support for two new Realtek controllers
- Support for new Intel Bluetooth controller
- Fix for supporting multiple slave-role Bluetooth LE connections
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/bluetooth/btmrvl_main.c')
| -rw-r--r-- | drivers/bluetooth/btmrvl_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c index b280d466f05b..f6c694a1b9b0 100644 --- a/drivers/bluetooth/btmrvl_main.c +++ b/drivers/bluetooth/btmrvl_main.c @@ -183,7 +183,7 @@ static int btmrvl_send_sync_cmd(struct btmrvl_private *priv, u16 opcode, return -EFAULT; } - skb = bt_skb_alloc(HCI_COMMAND_HDR_SIZE + len, GFP_ATOMIC); + skb = bt_skb_alloc(HCI_COMMAND_HDR_SIZE + len, GFP_KERNEL); if (!skb) { BT_ERR("No free skb"); return -ENOMEM; |