projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[powerpc.git]
/
drivers
/
net
/
lp486e.c
diff --git
a/drivers/net/lp486e.c
b/drivers/net/lp486e.c
index
94d5ea1
..
b783a69
100644
(file)
--- a/
drivers/net/lp486e.c
+++ b/
drivers/net/lp486e.c
@@
-851,7
+851,7
@@
static int i596_open(struct net_device *dev)
{
int i;
{
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;
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) {
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;
}
return 0;
length = ETH_ZLEN;
}