From 9096b273b7b4e8d8bd3f4f11702b462d700696d1 Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Fri, 7 Oct 2005 02:05:23 +0400
Subject: [PATCH] --- yaml --- r: 10929 b: refs/heads/master c:
 d8840ac907c7943bc7e196b11812adfa95cb28ef h: refs/heads/master i:   10927:
 d1fe9cb8ee34bac517f9178fba790646f618c57c v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/net/starfire.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c4e616eabc92..a7bddd8ad43e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 712cb1ebb1653538527500165d8382ca48a7fca1
+refs/heads/master: d8840ac907c7943bc7e196b11812adfa95cb28ef
diff --git a/trunk/drivers/net/starfire.c b/trunk/drivers/net/starfire.c
index efdb179ecc8c..38b2b0a3ce96 100644
--- a/trunk/drivers/net/starfire.c
+++ b/trunk/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;