diff options
| author |   Alexey Dobriyan <adobriyan@gmail.com> | 2005-10-07 02:05:23 +0400 |
|---|---|---|
| committer |   Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 16:16:59 -0400 |
| commit | d8840ac907c7943bc7e196b11812adfa95cb28ef (patch) | |
| tree | 59f0cd61bbb19ee979672012c3de33c591d336d5 /drivers/net/starfire.c | |
| parent | [PATCH] Fix CS89x0 KConfig for IXDP2X01 (diff) | |
| download | linux-dev-d8840ac907c7943bc7e196b11812adfa95cb28ef.tar.xz linux-dev-d8840ac907c7943bc7e196b11812adfa95cb28ef.zip | |
[PATCH] starfire: free_irq() on error path of netdev_open()
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net/starfire.c')
| -rw-r--r-- | drivers/net/starfire.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c index efdb179ecc8c..38b2b0a3ce96 100644 --- a/drivers/net/starfire.c +++ b/drivers/net/starfire.c @@ -1091,8 +1091,10 @@ static int netdev_open(struct net_device *dev) rx_ring_size = sizeof(struct starfire_rx_desc) * RX_RING_SIZE; np->queue_mem_size = tx_done_q_size + rx_done_q_size + tx_ring_size + rx_ring_size; np->queue_mem = pci_alloc_consistent(np->pci_dev, np->queue_mem_size, &np->queue_mem_dma); - if (np->queue_mem == 0) + if (np->queue_mem == NULL) { + free_irq(dev->irq, dev); return -ENOMEM; + } np->tx_done_q = np->queue_mem; np->tx_done_q_dma = np->queue_mem_dma; |