Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38454db3 authored by Finn Thain's avatar Finn Thain Committed by David S. Miller
Browse files

mac8390: propagate error code from request_irq 



Use the request_irq() error code as the return value for mac8390_open().
EAGAIN doesn't make sense for Nubus slot IRQs. Only this driver can claim
this IRQ (until the NIC is removed, which means everything is powered
down).

Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c1f8fc57

drivers/net/mac8390.c

+6 −5
Original line number Diff line number Diff line
@@ -641,12 +641,13 @@ static int __init mac8390_initdev(struct net_device *dev, 


static int mac8390_open(struct net_device *dev)

{

	int err;



	__ei_open(dev);

	if (request_irq(dev->irq, __ei_interrupt, 0, "8390 Ethernet", dev)) {

		pr_info("%s: unable to get IRQ %d.\n", dev->name, dev->irq);

		return -EAGAIN;

	}

	return 0;

	err = request_irq(dev->irq, __ei_interrupt, 0, "8390 Ethernet", dev);

	if (err)

		pr_info("%s: unable to get IRQ %d\n", dev->name, dev->irq);

	return err;

}



static int mac8390_close(struct net_device *dev)