From: Amitoj Kaur Chawla Date: Sat, 10 Oct 2015 09:01:11 +0000 (+0530) Subject: staging: rtl8712: Replace GFP_ATOMIC with GFP_KERNEL X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b33fc7229154341c466cbc5c5b7ca69d16054771;p=linux-beck.git 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 Signed-off-by: Greg Kroah-Hartman --- 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;