From a229666e1336ef4f1cd678ae7287753f2d8d0ebf Mon Sep 17 00:00:00 2001
From: Roopa Prabhu <roprabhu@cisco.com>
Date: Tue, 10 Aug 2010 18:55:20 +0000
Subject: [PATCH] --- yaml --- r: 213809 b: refs/heads/master c:
 832177901a61aeda1f2122e323c39881ec84af65 h: refs/heads/master i:   213807:
 f8d88d430a8b6d0ed2355384f8262bb671fec507 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/net/enic/vnic_rq.c | 6 ++++--
 trunk/drivers/net/enic/vnic_wq.c | 6 ++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index c20e656a857a..f1a5536676a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce16cc02f9fe21d4e42116305e5ea9d12e51635d
+refs/heads/master: 832177901a61aeda1f2122e323c39881ec84af65
diff --git a/trunk/drivers/net/enic/vnic_rq.c b/trunk/drivers/net/enic/vnic_rq.c
index dbb2aca258b9..b236d7cbc137 100644
--- a/trunk/drivers/net/enic/vnic_rq.c
+++ b/trunk/drivers/net/enic/vnic_rq.c
@@ -77,8 +77,10 @@ void vnic_rq_free(struct vnic_rq *rq)
 	vnic_dev_free_desc_ring(vdev, &rq->ring);
 
 	for (i = 0; i < VNIC_RQ_BUF_BLKS_MAX; i++) {
-		kfree(rq->bufs[i]);
-		rq->bufs[i] = NULL;
+		if (rq->bufs[i]) {
+			kfree(rq->bufs[i]);
+			rq->bufs[i] = NULL;
+		}
 	}
 
 	rq->ctrl = NULL;
diff --git a/trunk/drivers/net/enic/vnic_wq.c b/trunk/drivers/net/enic/vnic_wq.c
index 122e33bcc578..4b2a6c6a569b 100644
--- a/trunk/drivers/net/enic/vnic_wq.c
+++ b/trunk/drivers/net/enic/vnic_wq.c
@@ -77,8 +77,10 @@ void vnic_wq_free(struct vnic_wq *wq)
 	vnic_dev_free_desc_ring(vdev, &wq->ring);
 
 	for (i = 0; i < VNIC_WQ_BUF_BLKS_MAX; i++) {
-		kfree(wq->bufs[i]);
-		wq->bufs[i] = NULL;
+		if (wq->bufs[i]) {
+			kfree(wq->bufs[i]);
+			wq->bufs[i] = NULL;
+		}
 	}
 
 	wq->ctrl = NULL;