diff options
| author | Amitoj Kaur Chawla | 2015-10-10 11:01:11 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-10-13 05:43:20 +0200 |
| commit | b33fc7229154341c466cbc5c5b7ca69d16054771 (patch) | |
| tree | 777c9f121b2a476c6f724d5903ea515323a011f9 /drivers/staging/rtl8712/hal_init.c | |
| parent | Staging: rtl8712: Use ARRAY_SIZE macro (diff) | |
| download | kernel-qcow2-linux-b33fc7229154341c466cbc5c5b7ca69d16054771.tar.gz kernel-qcow2-linux-b33fc7229154341c466cbc5c5b7ca69d16054771.tar.xz kernel-qcow2-linux-b33fc7229154341c466cbc5c5b7ca69d16054771.zip | |
staging: rtl8712: Replace GFP_ATOMIC with GFP_KERNEL
Replace GFP_ATOMIC with GFP_KERNEL since GFP_ATOMIC is used in
atomic context and only needed when functions are not allowed to sleep
whereas the function is later calling msleep().
Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8712/hal_init.c')
| -rw-r--r-- | drivers/staging/rtl8712/hal_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/rtl8712/hal_init.c b/drivers/staging/rtl8712/hal_init.c index 15c6160fc32a..d3a12083e86d 100644 --- a/drivers/staging/rtl8712/hal_init.c +++ b/drivers/staging/rtl8712/hal_init.c @@ -177,7 +177,7 @@ static u8 rtl8712_dl_fw(struct _adapter *padapter) maxlen = (fwhdr.img_IMEM_size > fwhdr.img_SRAM_size) ? fwhdr.img_IMEM_size : fwhdr.img_SRAM_size; maxlen += txdscp_sz; - ptmpchar = kmalloc(maxlen + FWBUFF_ALIGN_SZ, GFP_ATOMIC); + ptmpchar = kmalloc(maxlen + FWBUFF_ALIGN_SZ, GFP_KERNEL); if (!ptmpchar) return ret; |