diff options
Diffstat (limited to 'net/bluetooth')
-rw-r--r-- | net/bluetooth/mgmt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index eff610d5081a..86590c653232 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c | |||
@@ -1268,7 +1268,7 @@ static int add_uuid(struct sock *sk, struct hci_dev *hdev, void *data, u16 len) | |||
1268 | goto failed; | 1268 | goto failed; |
1269 | } | 1269 | } |
1270 | 1270 | ||
1271 | uuid = kmalloc(sizeof(*uuid), GFP_ATOMIC); | 1271 | uuid = kmalloc(sizeof(*uuid), GFP_KERNEL); |
1272 | if (!uuid) { | 1272 | if (!uuid) { |
1273 | err = -ENOMEM; | 1273 | err = -ENOMEM; |
1274 | goto failed; | 1274 | goto failed; |
@@ -1667,7 +1667,7 @@ static int get_connections(struct sock *sk, struct hci_dev *hdev, void *data, | |||
1667 | } | 1667 | } |
1668 | 1668 | ||
1669 | rp_len = sizeof(*rp) + (i * sizeof(struct mgmt_addr_info)); | 1669 | rp_len = sizeof(*rp) + (i * sizeof(struct mgmt_addr_info)); |
1670 | rp = kmalloc(rp_len, GFP_ATOMIC); | 1670 | rp = kmalloc(rp_len, GFP_KERNEL); |
1671 | if (!rp) { | 1671 | if (!rp) { |
1672 | err = -ENOMEM; | 1672 | err = -ENOMEM; |
1673 | goto unlock; | 1673 | goto unlock; |