From 439aa8d1955ad622780c9e85af194b8a6f592172 Mon Sep 17 00:00:00 2001
From: Michael Chan <mchan@broadcom.com>
Date: Fri, 2 May 2008 16:57:26 -0700
Subject: [PATCH] --- yaml --- r: 95908 b: refs/heads/master c:
 352f76879ebde543817360ce9c18c973d4300f4f h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/bnx2.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 680dec84c19f..d69e559a0c0e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15b169cccff1503a88f12f104e5657c65c53ade7
+refs/heads/master: 352f76879ebde543817360ce9c18c973d4300f4f
diff --git a/trunk/drivers/net/bnx2.c b/trunk/drivers/net/bnx2.c
index 0fcea8590777..942ae06843ba 100644
--- a/trunk/drivers/net/bnx2.c
+++ b/trunk/drivers/net/bnx2.c
@@ -2222,6 +2222,11 @@ bnx2_init_5709_context(struct bnx2 *bp)
 	for (i = 0; i < bp->ctx_pages; i++) {
 		int j;
 
+		if (bp->ctx_blk[i])
+			memset(bp->ctx_blk[i], 0, BCM_PAGE_SIZE);
+		else
+			return -ENOMEM;
+
 		REG_WR(bp, BNX2_CTX_HOST_PAGE_TBL_DATA0,
 		       (bp->ctx_blk_mapping[i] & 0xffffffff) |
 		       BNX2_CTX_HOST_PAGE_TBL_DATA0_VALID);