diff options
| author | David S. Miller | 2015-02-12 04:49:44 +0100 |
|---|---|---|
| committer | David S. Miller | 2015-02-12 04:49:44 +0100 |
| commit | b3b482c6e2259729ca8ab25eb488373abbc4675d (patch) | |
| tree | 198aa8f0c9f06d890297788ac0fc1e4286c3b35d /drivers/net/wireless | |
| parent | bgmac: fix device initialization on Northstar SoCs (condition typo) (diff) | |
| parent | rtlwifi: Remove logging statement that is no longer needed (diff) | |
| download | kernel-qcow2-linux-b3b482c6e2259729ca8ab25eb488373abbc4675d.tar.gz kernel-qcow2-linux-b3b482c6e2259729ca8ab25eb488373abbc4675d.tar.xz kernel-qcow2-linux-b3b482c6e2259729ca8ab25eb488373abbc4675d.zip | |
Merge tag 'wireless-drivers-for-davem-2015-02-11' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers
rtlwifi:
* remove superfluous warning message which is not needed anymore
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/pci.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c index ec456f0d972e..a62170ea0481 100644 --- a/drivers/net/wireless/rtlwifi/pci.c +++ b/drivers/net/wireless/rtlwifi/pci.c @@ -822,11 +822,8 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw) /* get a new skb - if fail, old one will be reused */ new_skb = dev_alloc_skb(rtlpci->rxbuffersize); - if (unlikely(!new_skb)) { - pr_err("Allocation of new skb failed in %s\n", - __func__); + if (unlikely(!new_skb)) goto no_new; - } if (rtlpriv->use_new_trx_flow) { buffer_desc = &rtlpci->rx_ring[rxring_idx].buffer_desc |