Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

[~andy/linux] / drivers / net / atarilance.c

diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c
index 442b2cbeb58a739507efca61d12f69139486d064..91783a8008be13be058d4081ad196b613336937f 100644 (file)
--- a/drivers/net/atarilance.c
+++ b/drivers/net/atarilance.c
@@ -804,8 +804,7 @@ static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev )
                ++len;
                
        if (len > skb->len) {
-               skb = skb_padto(skb, len);
-               if (skb == NULL)
+               if (skb_padto(skb, len))
                        return 0;
        }