From af822e96b26c55ba4d79181dfdd9548018daf1de Mon Sep 17 00:00:00 2001 From: Carolyn Wyborny Date: Thu, 24 Feb 2011 03:12:15 +0000 Subject: [PATCH] --- yaml --- r: 237552 b: refs/heads/master c: 93ed835928f3100c95e0408df0543f35d03f7c23 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/igb/igb_ethtool.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 87da6b94289b..d3b36664177f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b082d734a938b951ed4b9b5a850ae3513d4a7e3 +refs/heads/master: 93ed835928f3100c95e0408df0543f35d03f7c23 diff --git a/trunk/drivers/net/igb/igb_ethtool.c b/trunk/drivers/net/igb/igb_ethtool.c index a70e16bcfa7e..16bbd4922bc3 100644 --- a/trunk/drivers/net/igb/igb_ethtool.c +++ b/trunk/drivers/net/igb/igb_ethtool.c @@ -1070,7 +1070,7 @@ static bool reg_pattern_test(struct igb_adapter *adapter, u64 *data, {0x5A5A5A5A, 0xA5A5A5A5, 0x00000000, 0xFFFFFFFF}; for (pat = 0; pat < ARRAY_SIZE(_test); pat++) { wr32(reg, (_test[pat] & write)); - val = rd32(reg); + val = rd32(reg) & mask; if (val != (_test[pat] & write & mask)) { dev_err(&adapter->pdev->dev, "pattern test reg %04X " "failed: got 0x%08X expected 0x%08X\n",