aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth
diff options
context:
space:
mode:
authorDavid Herrmann <dh.herrmann@googlemail.com>2011-10-25 06:09:52 -0400
committerGustavo F. Padovan <padovan@profusion.mobi>2011-11-07 14:24:52 -0500
commit52a1020e80beece986002f673eca24dae6255b55 (patch)
tree9f90f39d76ec76355a5a9c63f19e0357dc410ac8 /drivers/bluetooth
parentdf164df9a77979d1774ede353988c1a62584594b (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/bluetooth')
-rw-r--r--drivers/bluetooth/ath3k.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
index 39b25ac51c10..1622772f802d 100644
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
@@ -106,7 +106,7 @@ static int ath3k_load_firmware(struct usb_device *udev,
106 106
107 pipe = usb_sndctrlpipe(udev, 0); 107 pipe = usb_sndctrlpipe(udev, 0);
108 108
109 send_buf = kmalloc(BULK_SIZE, GFP_ATOMIC); 109 send_buf = kmalloc(BULK_SIZE, GFP_KERNEL);
110 if (!send_buf) { 110 if (!send_buf) {
111 BT_ERR("Can't allocate memory chunk for firmware"); 111 BT_ERR("Can't allocate memory chunk for firmware");
112 return -ENOMEM; 112 return -ENOMEM;
@@ -177,7 +177,7 @@ static int ath3k_load_fwfile(struct usb_device *udev,
177 177
178 count = firmware->size; 178 count = firmware->size;
179 179
180 send_buf = kmalloc(BULK_SIZE, GFP_ATOMIC); 180 send_buf = kmalloc(BULK_SIZE, GFP_KERNEL);
181 if (!send_buf) { 181 if (!send_buf) {
182 BT_ERR("Can't allocate memory chunk for firmware"); 182 BT_ERR("Can't allocate memory chunk for firmware");
183 return -ENOMEM; 183 return -ENOMEM;