merge linus into release branch

[linux-2.6-omap-h63xx.git] / drivers / net / eexpress.c

diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c
index 82bd356e4f3abf8d2ecf7ff909f8ce4b7bda149f..a74b20715755d4ff5dd63f98aa57e53248c41b1e 100644 (file)
--- a/drivers/net/eexpress.c
+++ b/drivers/net/eexpress.c
@@ -677,8 +677,7 @@ static int eexp_xmit(struct sk_buff *buf, struct net_device *dev)
 #endif
 
        if (buf->len < ETH_ZLEN) {
-               buf = skb_padto(buf, ETH_ZLEN);
-               if (buf == NULL)
+               if (skb_padto(buf, ETH_ZLEN))
                        return 0;
                length = ETH_ZLEN;
        }