diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-30 19:38:21 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-30 19:38:21 -0400 |
| commit | e1e302d8a9ab06ba8d7d5ec503d8996e6cf0eca4 (patch) | |
| tree | 6a6c805fdfd6a2f6433956cbee348b2c3a277784 /drivers/net/wireless/libertas/rx.c | |
| parent | 944ac4259e39801c843a915c3da8194ac9af0440 (diff) | |
| parent | 7f82f000ed030d1108b4de47d9e2d556092980c6 (diff) | |
Merge branch 'linus' into tracing/ftrace
Diffstat (limited to 'drivers/net/wireless/libertas/rx.c')
| -rw-r--r-- | drivers/net/wireless/libertas/rx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/rx.c b/drivers/net/wireless/libertas/rx.c index 5749f22b296f..079e6aa874dc 100644 --- a/drivers/net/wireless/libertas/rx.c +++ b/drivers/net/wireless/libertas/rx.c | |||
| @@ -328,7 +328,7 @@ static int process_rxed_802_11_packet(struct lbs_private *priv, | |||
| 328 | lbs_deb_rx("rx err: frame received with bad length\n"); | 328 | lbs_deb_rx("rx err: frame received with bad length\n"); |
| 329 | priv->stats.rx_length_errors++; | 329 | priv->stats.rx_length_errors++; |
| 330 | ret = -EINVAL; | 330 | ret = -EINVAL; |
| 331 | kfree(skb); | 331 | kfree_skb(skb); |
| 332 | goto done; | 332 | goto done; |
| 333 | } | 333 | } |
| 334 | 334 | ||