diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2005-10-06 18:05:23 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 16:16:59 -0400 |
commit | d8840ac907c7943bc7e196b11812adfa95cb28ef (patch) | |
tree | 59f0cd61bbb19ee979672012c3de33c591d336d5 /drivers/net | |
parent | 712cb1ebb1653538527500165d8382ca48a7fca1 (diff) |
[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')
-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) | |||
1091 | rx_ring_size = sizeof(struct starfire_rx_desc) * RX_RING_SIZE; | 1091 | rx_ring_size = sizeof(struct starfire_rx_desc) * RX_RING_SIZE; |
1092 | np->queue_mem_size = tx_done_q_size + rx_done_q_size + tx_ring_size + rx_ring_size; | 1092 | np->queue_mem_size = tx_done_q_size + rx_done_q_size + tx_ring_size + rx_ring_size; |
1093 | np->queue_mem = pci_alloc_consistent(np->pci_dev, np->queue_mem_size, &np->queue_mem_dma); | 1093 | np->queue_mem = pci_alloc_consistent(np->pci_dev, np->queue_mem_size, &np->queue_mem_dma); |
1094 | if (np->queue_mem == 0) | 1094 | if (np->queue_mem == NULL) { |
1095 | free_irq(dev->irq, dev); | ||
1095 | return -ENOMEM; | 1096 | return -ENOMEM; |
1097 | } | ||
1096 | 1098 | ||
1097 | np->tx_done_q = np->queue_mem; | 1099 | np->tx_done_q = np->queue_mem; |
1098 | np->tx_done_q_dma = np->queue_mem_dma; | 1100 | np->tx_done_q_dma = np->queue_mem_dma; |