diff options
author | David Herrmann <dh.herrmann@googlemail.com> | 2011-10-25 06:09:52 -0400 |
---|---|---|
committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-10-31 15:47:19 -0400 |
commit | 0ba22bb258341783939ed07bf7e7a9d92f3b0edf (patch) | |
tree | 3141aa8e3bd6aa02d79f40c7d3e2020f25ce1ff4 /drivers | |
parent | dafbde395ed560ddc3695df40f61d91c47433228 (diff) |
Bluetooth: ath3k: Use GFP_KERNEL instead of GFP_ATOMIC
We are allowed to sleep here so no need to use GFP_ATOMIC. The caller
(ath3k_probe) calls request_firmware() which definitely sleeps. Hence, we should
avoid using GFP_ATOMIC.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/bluetooth/ath3k.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c index db7cb8111fbe..106beb194f3c 100644 --- a/drivers/bluetooth/ath3k.c +++ b/drivers/bluetooth/ath3k.c | |||
@@ -105,7 +105,7 @@ static int ath3k_load_firmware(struct usb_device *udev, | |||
105 | 105 | ||
106 | pipe = usb_sndctrlpipe(udev, 0); | 106 | pipe = usb_sndctrlpipe(udev, 0); |
107 | 107 | ||
108 | send_buf = kmalloc(BULK_SIZE, GFP_ATOMIC); | 108 | send_buf = kmalloc(BULK_SIZE, GFP_KERNEL); |
109 | if (!send_buf) { | 109 | if (!send_buf) { |
110 | BT_ERR("Can't allocate memory chunk for firmware"); | 110 | BT_ERR("Can't allocate memory chunk for firmware"); |
111 | return -ENOMEM; | 111 | return -ENOMEM; |
@@ -176,7 +176,7 @@ static int ath3k_load_fwfile(struct usb_device *udev, | |||
176 | 176 | ||
177 | count = firmware->size; | 177 | count = firmware->size; |
178 | 178 | ||
179 | send_buf = kmalloc(BULK_SIZE, GFP_ATOMIC); | 179 | send_buf = kmalloc(BULK_SIZE, GFP_KERNEL); |
180 | if (!send_buf) { | 180 | if (!send_buf) { |
181 | BT_ERR("Can't allocate memory chunk for firmware"); | 181 | BT_ERR("Can't allocate memory chunk for firmware"); |
182 | return -ENOMEM; | 182 | return -ENOMEM; |