From fcaf69869abc9f4ffdece85b4e814573983d3883 Mon Sep 17 00:00:00 2001 From: Emil Tantilov Date: Fri, 18 Jan 2013 02:16:41 +0000 Subject: [PATCH] --- yaml --- r: 352509 b: refs/heads/master c: d0310dc415a670ae2b2e27076b4685d988830479 h: refs/heads/master i: 352507: f6cf7586b4a7d1fe6e8aab5693e592dab29187fa v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7942b289d4cb..f1b29dc08839 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c696ca9fbabc5f94a3c6db7f009e73f0ef21831 +refs/heads/master: d0310dc415a670ae2b2e27076b4685d988830479 diff --git a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c index eb534a071fde..d7b5bd047604 100644 --- a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c +++ b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c @@ -1307,9 +1307,9 @@ s32 ixgbe_read_i2c_byte_generic(struct ixgbe_hw *hw, u8 byte_offset, break; fail: + ixgbe_i2c_bus_clear(hw); hw->mac.ops.release_swfw_sync(hw, swfw_mask); msleep(100); - ixgbe_i2c_bus_clear(hw); retry++; if (retry < max_retry) hw_dbg(hw, "I2C byte read error - Retrying.\n");