diff options
author | John W. Linville <linville@tuxdriver.com> | 2012-09-07 21:07:55 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-09-07 21:07:55 +0200 |
commit | fac805f8c198092de9a2842efd7f5022e2937b18 (patch) | |
tree | 7557809c373f97a343c427d8fded0696060394ce /drivers/misc/ti-st | |
parent | rtlwifi: Update header file (diff) | |
parent | libertas sdio: fix suspend when interface is down (diff) | |
download | linux-fac805f8c198092de9a2842efd7f5022e2937b18.tar.xz linux-fac805f8c198092de9a2842efd7f5022e2937b18.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/misc/ti-st')
-rw-r--r-- | drivers/misc/ti-st/st_core.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/misc/ti-st/st_core.c b/drivers/misc/ti-st/st_core.c index 2b62232c2c6a..acfaeeb9e01a 100644 --- a/drivers/misc/ti-st/st_core.c +++ b/drivers/misc/ti-st/st_core.c @@ -349,6 +349,11 @@ void st_int_recv(void *disc_data, st_gdata->rx_skb = alloc_skb( st_gdata->list[type]->max_frame_size, GFP_ATOMIC); + if (st_gdata->rx_skb == NULL) { + pr_err("out of memory: dropping\n"); + goto done; + } + skb_reserve(st_gdata->rx_skb, st_gdata->list[type]->reserve); /* next 2 required for BT only */ |