X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fnet%2Flance.c;h=bb5ad479210b17f8b93498912926e461da854090;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=5b4dbfe5fb7710ff0675b8834a6e014f42b66cf8;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/drivers/net/lance.c b/drivers/net/lance.c
index 5b4dbfe5f..bb5ad4792 100644
--- a/drivers/net/lance.c
+++ b/drivers/net/lance.c
@@ -326,7 +326,7 @@ MODULE_PARM_DESC(dma, "LANCE/PCnet ISA DMA channel (ignored for some devices)");
 MODULE_PARM_DESC(irq, "LANCE/PCnet IRQ number (ignored for some devices)");
 MODULE_PARM_DESC(lance_debug, "LANCE/PCnet debug level (0-7)");
 
-int __init init_module(void)
+int init_module(void)
 {
 	struct net_device *dev;
 	int this_dev, found = 0;
@@ -968,7 +968,8 @@ static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev)
 	/* The old LANCE chips doesn't automatically pad buffers to min. size. */
 	if (chip_table[lp->chip_version].flags & LANCE_MUST_PAD) {
 		if (skb->len < ETH_ZLEN) {
-			if (skb_padto(skb, ETH_ZLEN))
+			skb = skb_padto(skb, ETH_ZLEN);
+			if (skb == NULL)
 				goto out;
 			lp->tx_ring[entry].length = -ETH_ZLEN;
 		}