From: Dan Carpenter Date: Tue, 17 Apr 2012 06:28:47 +0000 (+0300) Subject: wlcore: fixup an allocation X-Git-Tag: v3.5-rc1~35^2~3^2~18^2~88 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0230dfea09f7319658c86c07f5507092366dfc00;p=platform%2Fupstream%2Fkernel-adaptation-pc.git wlcore: fixup an allocation GFP_DMA isn't supposed to be used by itself. This allocation is allowed to sleep so it should be ORing it with GFP_KERNEL. Also we should check for allocations errors. Signed-off-by: Dan Carpenter Signed-off-by: Luciano Coelho --- diff --git a/drivers/net/wireless/ti/wlcore/cmd.c b/drivers/net/wireless/ti/wlcore/cmd.c index 5c4716c..7ea10e1 100644 --- a/drivers/net/wireless/ti/wlcore/cmd.c +++ b/drivers/net/wireless/ti/wlcore/cmd.c @@ -123,7 +123,9 @@ static int wl1271_cmd_wait_for_event_or_timeout(struct wl1271 *wl, u32 mask) unsigned long timeout; int ret = 0; - events_vector = kmalloc(sizeof(*events_vector), GFP_DMA); + events_vector = kmalloc(sizeof(*events_vector), GFP_KERNEL | GFP_DMA); + if (!events_vector) + return -ENOMEM; timeout = jiffies + msecs_to_jiffies(WL1271_EVENT_TIMEOUT);