diff options
author | H. Peter Anvin <hpa@linux.intel.com> | 2013-06-20 21:13:55 -0700 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-06-20 21:13:55 -0700 |
commit | e6bca5a6a8a0cdc41a9e1e3e69bc8476ac6a8ed4 (patch) | |
tree | 2651a8a7b81ee71113bdeda8425a2083f2842b20 /drivers/net/wireless/rtlwifi/pci.c | |
parent | e8747f10ba3f7638b1c1fcab9c66a01733213d45 (diff) | |
parent | 7d132055814ef17a6c7b69f342244c410a5e000f (diff) | |
download | linux-stable-e6bca5a6a8a0cdc41a9e1e3e69bc8476ac6a8ed4.tar.gz linux-stable-e6bca5a6a8a0cdc41a9e1e3e69bc8476ac6a8ed4.tar.bz2 linux-stable-e6bca5a6a8a0cdc41a9e1e3e69bc8476ac6a8ed4.zip |
Merge tag 'v3.10-rc6' into x86/cleanups
Linux 3.10-rc6
We need a change that is the mainline tree for further work.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'drivers/net/wireless/rtlwifi/pci.c')
-rw-r--r-- | drivers/net/wireless/rtlwifi/pci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c index 999ffc12578b..c97e9d327331 100644 --- a/drivers/net/wireless/rtlwifi/pci.c +++ b/drivers/net/wireless/rtlwifi/pci.c @@ -764,6 +764,7 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw) "can't alloc skb for rx\n"); goto done; } + kmemleak_not_leak(new_skb); pci_unmap_single(rtlpci->pdev, *((dma_addr_t *) skb->cb), |