From 22af6705a9834d873d81e5afe632f1fc4089680e Mon Sep 17 00:00:00 2001
From: Ron Mercer <ron.mercer@qlogic.com>
Date: Mon, 2 Feb 2009 13:54:15 -0800
Subject: [PATCH] --- yaml --- r: 130875 b: refs/heads/master c:
 e78f5fa7cc1a211eb9909ef90b0de3311086ba55 h: refs/heads/master i:   130873:
 8c498e758c118bc664d0ddcac3d70a688731a322   130871:
 c1673593a9eb226722319b93d1a38cf650a79ef6 v: v3

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

diff --git a/[refs] b/[refs]
index afa117b4c251..26e238450fb1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26351479ed43288be92935826c215fbe01e2abb2
+refs/heads/master: e78f5fa7cc1a211eb9909ef90b0de3311086ba55
diff --git a/trunk/drivers/net/qlge/qlge_main.c b/trunk/drivers/net/qlge/qlge_main.c
index 17d02eb6c8be..c6c070475f07 100644
--- a/trunk/drivers/net/qlge/qlge_main.c
+++ b/trunk/drivers/net/qlge/qlge_main.c
@@ -670,12 +670,19 @@ static int ql_get_flash_params(struct ql_adapter *qdev)
 	int i;
 	int status;
 	__le32 *p = (__le32 *)&qdev->flash;
+	u32 offset = 0;
+
+	/* Second function's parameters follow the first
+	 * function's.
+	 */
+	if (qdev->func)
+		offset = sizeof(qdev->flash) / sizeof(u32);
 
 	if (ql_sem_spinlock(qdev, SEM_FLASH_MASK))
 		return -ETIMEDOUT;
 
 	for (i = 0; i < sizeof(qdev->flash) / sizeof(u32); i++, p++) {
-		status = ql_read_flash_word(qdev, i, p);
+		status = ql_read_flash_word(qdev, i+offset, p);
 		if (status) {
 			QPRINTK(qdev, IFUP, ERR, "Error reading flash.\n");
 			goto exit;