diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-11-02 15:15:51 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-11-02 15:15:51 -0400 |
| commit | c125d5e846894043361c0c89c1140be8fd6600b7 (patch) | |
| tree | 8c613b696dc65b047ae6660e55abcd0c008be490 /drivers/bluetooth/ath3k.c | |
| parent | 6a32e4f9dd9219261f8856f817e6655114cfec2f (diff) | |
| parent | 6b441fab28ea1cbbf3da75dcd1e7438e6cba704c (diff) | |
| download | linux-c125d5e846894043361c0c89c1140be8fd6600b7.tar.gz linux-c125d5e846894043361c0c89c1140be8fd6600b7.tar.bz2 linux-c125d5e846894043361c0c89c1140be8fd6600b7.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth
Diffstat (limited to 'drivers/bluetooth/ath3k.c')
| -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, pipe = usb_sndctrlpipe(udev, 0); - send_buf = kmalloc(BULK_SIZE, GFP_ATOMIC); + send_buf = kmalloc(BULK_SIZE, GFP_KERNEL); if (!send_buf) { BT_ERR("Can't allocate memory chunk for firmware"); return -ENOMEM; @@ -176,7 +176,7 @@ static int ath3k_load_fwfile(struct usb_device *udev, count = firmware->size; - send_buf = kmalloc(BULK_SIZE, GFP_ATOMIC); + send_buf = kmalloc(BULK_SIZE, GFP_KERNEL); if (!send_buf) { BT_ERR("Can't allocate memory chunk for firmware"); return -ENOMEM; |