---

yaml --- r: 369283 b: refs/heads/master c: d011157 h: refs/heads/master i: 369281: 53dec11 369279: 1341c71 v: v3
git-mirror · Apr 18, 2013 · 71d0920 · 71d0920
1 parent 04f61a3
commit 71d0920
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20967f42025f50e8497e6d71259ac5fb56655736
+refs/heads/master: d01115752f5e37b2c79280d60c0e8e19267a0cc9
diff --git a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
@@ -1125,7 +1125,7 @@ s32 ixgbe_read_eerd_buffer_generic(struct ixgbe_hw *hw, u16 offset,
 	}
 
 	for (i = 0; i < words; i++) {
-		eerd = ((offset + i) << IXGBE_EEPROM_RW_ADDR_SHIFT) +
+		eerd = ((offset + i) << IXGBE_EEPROM_RW_ADDR_SHIFT) |
 		       IXGBE_EEPROM_RW_REG_START;
 
 		IXGBE_WRITE_REG(hw, IXGBE_EERD, eerd);