Commit 31395026 authored by William Stinson's avatar William Stinson Committed by Jeff Garzik

[janitor] update the atarilance Ethernet driver for VME Lance cards on the...

[janitor] update the atarilance Ethernet driver for VME Lance cards on the Atari to check the result of request_irq and exit in case of error.

Patch is also available at the following URL
        http://www.chez.com/wstinson/linux/kernel/patch-net-atari

I don't have this hardware to check for myself
parent ad2f3401
...@@ -546,8 +546,11 @@ static unsigned long __init lance_probe1( struct net_device *dev, ...@@ -546,8 +546,11 @@ static unsigned long __init lance_probe1( struct net_device *dev,
if (lp->cardtype == PAM_CARD || if (lp->cardtype == PAM_CARD ||
memaddr == (unsigned short *)0xffe00000) { memaddr == (unsigned short *)0xffe00000) {
/* PAMs card and Riebl on ST use level 5 autovector */ /* PAMs card and Riebl on ST use level 5 autovector */
request_irq(IRQ_AUTO_5, lance_interrupt, IRQ_TYPE_PRIO, if (request_irq(IRQ_AUTO_5, lance_interrupt, IRQ_TYPE_PRIO,
"PAM/Riebl-ST Ethernet", dev); "PAM/Riebl-ST Ethernet", dev)) {
printk( "Lance: request for irq %d failed\n", IRQ_AUTO_5 );
return( 0 );
}
dev->irq = (unsigned short)IRQ_AUTO_5; dev->irq = (unsigned short)IRQ_AUTO_5;
} }
else { else {
...@@ -560,8 +563,11 @@ static unsigned long __init lance_probe1( struct net_device *dev, ...@@ -560,8 +563,11 @@ static unsigned long __init lance_probe1( struct net_device *dev,
printk( "Lance: request for VME interrupt failed\n" ); printk( "Lance: request for VME interrupt failed\n" );
return( 0 ); return( 0 );
} }
request_irq(irq, lance_interrupt, IRQ_TYPE_PRIO, if (request_irq(irq, lance_interrupt, IRQ_TYPE_PRIO,
"Riebl-VME Ethernet", dev); "Riebl-VME Ethernet", dev)) {
printk( "Lance: request for irq %d failed\n", irq );
return( 0 );
}
dev->irq = irq; dev->irq = irq;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment