X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=drivers%2Fnet%2Flp486e.c;h=b783a6984abc0efd6f88ab8e814a70adc3656fc9;hb=ec590970f0f45a11c06b9525cd718dbdde22b4a3;hp=94d5ea1ce8bd9b9c9e14f05694e699c387eff662;hpb=89a2fa5f2139be35e214bcf86a8291d6a1da75f2;p=powerpc.git

diff --git a/drivers/net/lp486e.c b/drivers/net/lp486e.c
index 94d5ea1ce8..b783a6984a 100644
--- a/drivers/net/lp486e.c
+++ b/drivers/net/lp486e.c
@@ -851,7 +851,7 @@ static int i596_open(struct net_device *dev)
 {
 	int i;
 
-	i = request_irq(dev->irq, &i596_interrupt, SA_SHIRQ, dev->name, dev);
+	i = request_irq(dev->irq, &i596_interrupt, IRQF_SHARED, dev->name, dev);
 	if (i) {
 		printk(KERN_ERR "%s: IRQ %d not free\n", dev->name, dev->irq);
 		return i;
@@ -877,8 +877,7 @@ static int i596_start_xmit (struct sk_buff *skb, struct net_device *dev) {
 	length = skb->len;
 	
 	if (length < ETH_ZLEN) {
-		skb = skb_padto(skb, ETH_ZLEN);
-		if (skb == NULL)
+		if (skb_padto(skb, ETH_ZLEN))
 			return 0;
 		length = ETH_ZLEN;
 	}