diff options
| author | Kulikov Vasiliy <segooon@gmail.com> | 2010-07-10 01:01:44 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-12 20:21:45 -0700 |
| commit | dbe000ed3f3033e8e6321d79023c827faf649c4d (patch) | |
| tree | 324eb7512d9a72d2b5c372e78851b814fc6e0568 /drivers/net/xtsonic.c | |
| parent | 546e3abde391ef01ef4690e941611654343ea0bf (diff) | |
| download | blackbird-op-linux-dbe000ed3f3033e8e6321d79023c827faf649c4d.tar.gz blackbird-op-linux-dbe000ed3f3033e8e6321d79023c827faf649c4d.zip | |
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>
Diffstat (limited to 'drivers/net/xtsonic.c')
| -rw-r--r-- | drivers/net/xtsonic.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/net/xtsonic.c b/drivers/net/xtsonic.c index fdba9cb3a599..9f12026d98e7 100644 --- a/drivers/net/xtsonic.c +++ b/drivers/net/xtsonic.c @@ -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) |
