Merge branch 'master' into devel

[linux-2.6-omap-h63xx.git] / net / iucv / af_iucv.c

diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index eb8a2a0b6eb71fc10671097563e71c3b7ae97ed9..49e786535dc82aecf96b6eea4179864cdb0cee85 100644 (file)
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -1171,8 +1171,7 @@ static void iucv_callback_txdone(struct iucv_path *path,
 
                spin_unlock_irqrestore(&list->lock, flags);
 
-               if (this)
-                       kfree_skb(this);
+               kfree_skb(this);
        }
        BUG_ON(!this);