forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wlcore: use GFP_KERNEL together with GFP_DMA

Browse source 
GFP_DMA should not be used by itself, it still needs GFP_KERNEL or
such.  Fix two occurrences of allocations with GFP_DMA only.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
This commit is contained in:
Luciano Coelho 2012-05-03 10:31:02 +03:00 • committed by John W. Linville
parent 03bed29e05
commit fd492ed789
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/wireless/ti/wlcore/boot.c
View file

@ -72,7 +72,7 @@ static int wlcore_boot_fw_version(struct wl1271 *wl)
struct wl1271_static_data *static_data; struct wl1271_static_data *static_data;
int ret; int ret;
static_data = kmalloc(sizeof(*static_data), GFP_DMA); static_data = kmalloc(sizeof(*static_data), GFP_KERNEL | GFP_DMA);
if (!static_data) { if (!static_data) {
wl1271_error("Couldn't allocate memory for static data!"); wl1271_error("Couldn't allocate memory for static data!");
return -ENOMEM; return -ENOMEM;

2
drivers/net/wireless/ti/wlcore/main.c
View file

@ -4861,7 +4861,7 @@ struct ieee80211_hw *wlcore_alloc_hw(size_t priv_size)
goto err_dummy_packet; goto err_dummy_packet;
} }
wl->mbox = kmalloc(sizeof(*wl->mbox), GFP_DMA); wl->mbox = kmalloc(sizeof(*wl->mbox), GFP_KERNEL | GFP_DMA);
if (!wl->mbox) { if (!wl->mbox) {
ret = -ENOMEM; ret = -ENOMEM;
goto err_fwlog; goto err_fwlog;