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; }