diff options
| author | David S. Miller <davem@davemloft.net> | 2011-11-21 18:50:33 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-21 18:50:33 (GMT) |
| commit | efd0bf97deeddd9ba53daabfc470a1399c6b0b2d (patch) | |
| tree | eec56da5fbc796bac7c67f1990a18f5e0a304059 /drivers/net/wireless/libertas/if_spi.c | |
| parent | f8a15af093b19b86d56933c8757cee298d0f32a8 (diff) | |
| parent | 6fe4c6d466e95d31164f14b1ac4aefb51f0f4f82 (diff) | |
| download | linux-fsl-qoriq-efd0bf97deeddd9ba53daabfc470a1399c6b0b2d.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The forcedeth changes had a conflict with the conversion over
to atomic u64 statistics in net-next.
The libertas cfg.c code had a conflict with the bss reference
counting fix by John Linville in net-next.
Conflicts:
drivers/net/ethernet/nvidia/forcedeth.c
drivers/net/wireless/libertas/cfg.c
Diffstat (limited to 'drivers/net/wireless/libertas/if_spi.c')
| -rw-r--r-- | drivers/net/wireless/libertas/if_spi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/libertas/if_spi.c b/drivers/net/wireless/libertas/if_spi.c index 11b69b3..728baa4 100644 --- a/drivers/net/wireless/libertas/if_spi.c +++ b/drivers/net/wireless/libertas/if_spi.c @@ -995,6 +995,7 @@ static int if_spi_host_to_card(struct lbs_private *priv, spin_unlock_irqrestore(&card->buffer_lock, flags); break; default: + kfree(packet); netdev_err(priv->dev, "can't transfer buffer of type %d\n", type); err = -EINVAL; |