Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

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;