Skip to content

Commit

Permalink
xtsonic: free irq if sonic_open() fails
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
segoon authored and davem330 committed Jul 13, 2010
1 parent 546e3ab commit dbe000e
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions drivers/net/xtsonic.c
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,20 @@ static unsigned short known_revisions[] =

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",
dev->name, dev->irq);
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)
Expand Down

0 comments on commit dbe000e

Please sign in to comment.