From ed60416b0d31bf4abbd7c83c4f8823998dad09ba Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Mon, 17 Dec 2007 23:00:31 -0800
Subject: [PATCH] --- yaml --- r: 75127 b: refs/heads/master c:
 286e310f94b9459f3fa975333781c969b1041522 h: refs/heads/master i:   75125:
 c85f6ecb9adbb4b1e4a949f067e97d431ee2a6f4   75123:
 36ffa6893842231144f9918a22183b357e208e60   75119:
 5ef60384803d2de22452e9ee5d531a99c9225002 v: v3

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

diff --git a/[refs] b/[refs]
index 1a9bfecff2cf..270735fbbfb0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9fc7dc514566e9788c7f064bb08f8b6e2fe6f72
+refs/heads/master: 286e310f94b9459f3fa975333781c969b1041522
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index a76bb3dd30f7..22eb7c8c1a25 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/drivers/net/tg3.c
@@ -10251,8 +10251,7 @@ static int tg3_nvram_write_block_unbuffered(struct tg3 *tp, u32 offset, u32 len,
 		phy_addr = offset & ~pagemask;
 
 		for (j = 0; j < pagesize; j += 4) {
-			/* Almost certainly should be tg3_nvram_read_le */
-			if ((ret = tg3_nvram_read(tp, phy_addr + j,
+			if ((ret = tg3_nvram_read_le(tp, phy_addr + j,
 						(__le32 *) (tmp + j))))
 				break;
 		}