diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2012-04-17 09:28:47 +0300 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2012-06-20 12:01:27 +0800 |
| commit | ac3aa3eac11ccab824838b34483df0976dca9518 (patch) | |
| tree | 938c661ed7b36f85e663957d1909c7730343c762 | |
| parent | 17d0165fef16bedf542127983551d46602b84d91 (diff) | |
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 <dan.carpenter@oracle.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
| -rw-r--r-- | drivers/net/wireless/ti/wlcore/cmd.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/ti/wlcore/cmd.c b/drivers/net/wireless/ti/wlcore/cmd.c index 5c4716c6f04..7ea10e1c98b 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); |