xtsonic: free irq if sonic_open() fails

xtsonic_open() doesn't check sonic_open() return code. If it is error
we must free requested IRQ.

Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Kulikov Vasiliy 2010-07-10 01:01:44 +00:00 committed by David S. Miller
parent 546e3abde3
commit dbe000ed3f
1 changed files with 10 additions and 2 deletions

View File

@ -93,12 +93,20 @@ static unsigned short known_revisions[] =
static int xtsonic_open(struct net_device *dev) static int xtsonic_open(struct net_device *dev)
{ {
if (request_irq(dev->irq,sonic_interrupt,IRQF_DISABLED,"sonic",dev)) { int retval;
retval = request_irq(dev->irq, sonic_interrupt, IRQF_DISABLED,
"sonic", dev);
if (retval) {
printk(KERN_ERR "%s: unable to get IRQ %d.\n", printk(KERN_ERR "%s: unable to get IRQ %d.\n",
dev->name, dev->irq); dev->name, dev->irq);
return -EAGAIN; return -EAGAIN;
} }
return sonic_open(dev);
retval = sonic_open(dev);
if (retval)
free_irq(dev->irq, dev);
return retval;
} }
static int xtsonic_close(struct net_device *dev) static int xtsonic_close(struct net_device *dev)