diff options
| author | Greg Kroah-Hartman | 2013-09-30 03:42:21 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-09-30 03:42:21 +0200 |
| commit | 73b227771899acd0039a9634a3c367cfadd211c1 (patch) | |
| tree | f61f0ab5be4999d958c5bbf052089dcd29f04d3d /drivers/staging/rtl8192u/r819xU_cmdpkt.c | |
| parent | Merge tag 'iio-for-3.13b' of git://git.kernel.org/pub/scm/linux/kernel/git/ji... (diff) | |
| parent | Linux 3.12-rc3 (diff) | |
| download | kernel-qcow2-linux-73b227771899acd0039a9634a3c367cfadd211c1.tar.gz kernel-qcow2-linux-73b227771899acd0039a9634a3c367cfadd211c1.tar.xz kernel-qcow2-linux-73b227771899acd0039a9634a3c367cfadd211c1.zip | |
Merge 3.12-rc3 into staging-next
We want the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8192u/r819xU_cmdpkt.c')
| -rw-r--r-- | drivers/staging/rtl8192u/r819xU_cmdpkt.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/rtl8192u/r819xU_cmdpkt.c b/drivers/staging/rtl8192u/r819xU_cmdpkt.c index e8b479a5ea21..f40f9c895f56 100644 --- a/drivers/staging/rtl8192u/r819xU_cmdpkt.c +++ b/drivers/staging/rtl8192u/r819xU_cmdpkt.c @@ -37,6 +37,8 @@ rt_status SendTxCommandPacket(struct net_device *dev, void *pData, u32 DataLen) /* Get TCB and local buffer from common pool. (It is shared by CmdQ, MgntQ, and USB coalesce DataQ) */ skb = dev_alloc_skb(USB_HWDESC_HEADER_LEN + DataLen + 4); + if (!skb) + return RT_STATUS_FAILURE; memcpy((unsigned char *)(skb->cb), &dev, sizeof(dev)); tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE); tcb_desc->queue_index = TXCMD_QUEUE; |