diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2013-02-21 16:16:55 +0100 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2013-02-22 10:07:30 +0100 |
| commit | edb15d83a875a1f4b1576188844db5c330c3267d (patch) | |
| tree | 74d54eab401b6ccf2a6ad4821227108a8d160f03 /drivers/net/wireless/mwifiex/11n_rxreorder.c | |
| parent | 8bfc245f9ad7bd4e461179e4e7852ef99b8b6144 (diff) | |
| parent | a0b1c42951dd06ec83cc1bc2c9788131d9fefcd8 (diff) | |
| download | talos-obmc-linux-edb15d83a875a1f4b1576188844db5c330c3267d.tar.gz talos-obmc-linux-edb15d83a875a1f4b1576188844db5c330c3267d.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mips-for-linux-next
Conflicts:
include/linux/ssb/ssb_driver_gige.h
Also resolves a logical merge conflict in drivers/net/ethernet/broadcom/-
bgmac.c due to change of an API.
Diffstat (limited to 'drivers/net/wireless/mwifiex/11n_rxreorder.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/11n_rxreorder.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/wireless/mwifiex/11n_rxreorder.c b/drivers/net/wireless/mwifiex/11n_rxreorder.c index 4a97acd170f7..5e796f847088 100644 --- a/drivers/net/wireless/mwifiex/11n_rxreorder.c +++ b/drivers/net/wireless/mwifiex/11n_rxreorder.c @@ -272,11 +272,8 @@ mwifiex_11n_create_rx_reorder_tbl(struct mwifiex_private *priv, u8 *ta, } /* if !tbl then create one */ new_node = kzalloc(sizeof(struct mwifiex_rx_reorder_tbl), GFP_KERNEL); - if (!new_node) { - dev_err(priv->adapter->dev, "%s: failed to alloc new_node\n", - __func__); + if (!new_node) return; - } INIT_LIST_HEAD(&new_node->list); new_node->tid = tid; |
