Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd492ed7 authored by Luciano Coelho's avatar Luciano Coelho Committed by John W. Linville
Browse files

wlcore: use GFP_KERNEL together with GFP_DMA 



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: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent 03bed29e

drivers/net/wireless/ti/wlcore/boot.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static int wlcore_boot_fw_version(struct wl1271 *wl) 
	struct wl1271_static_data *static_data;

	int ret;



	static_data = kmalloc(sizeof(*static_data), GFP_DMA);

	static_data = kmalloc(sizeof(*static_data), GFP_KERNEL | GFP_DMA);

	if (!static_data) {

		wl1271_error("Couldn't allocate memory for static data!");

		return -ENOMEM;

drivers/net/wireless/ti/wlcore/main.c

+1 −1
Original line number Diff line number Diff line
@@ -4861,7 +4861,7 @@ struct ieee80211_hw *wlcore_alloc_hw(size_t priv_size) 
		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) {

		ret = -ENOMEM;

		goto err_fwlog;