wlcore: fixup an allocation
authorDan Carpenter <dan.carpenter@oracle.com>
Tue, 17 Apr 2012 06:28:47 +0000 (09:28 +0300)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 15 May 2012 21:53:24 +0000 (17:53 -0400)
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 <dan.carpenter@oracle.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
drivers/net/wireless/ti/wlcore/cmd.c

index 5c4716c6f04057e9cee9226ec9f8274588d852bf..7ea10e1c98bfb0a1dba5d32facfcdb675bb9dff9 100644 (file)
@@ -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);