Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / net / irda / via-ircc.c

diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c
index b0a6cd815be198e11334880d9ce8a728ee28d4e4..67c0ad42d818a37a282312d72ab396f9b0a1e106 100644 (file)
--- a/drivers/net/irda/via-ircc.c
+++ b/drivers/net/irda/via-ircc.c
@@ -1182,12 +1182,13 @@ F01_E */
 
                skb = dev_alloc_skb(len + 1 - 4);
                /*
-                * if frame size,data ptr,or skb ptr are wrong ,the get next
+                * if frame size, data ptr, or skb ptr are wrong, then get next
                 * entry.
                 */
                if ((skb == NULL) || (skb->data == NULL) ||
                    (self->rx_buff.data == NULL) || (len < 6)) {
                        self->netdev->stats.rx_dropped++;
+                       kfree_skb(skb);
                        return TRUE;
                }
                skb_reserve(skb, 1);