From 509f2728eba05efe8cbfdcc2b12a71eada6c89b5 Mon Sep 17 00:00:00 2001 From: Emil Tantilov Date: Tue, 30 Aug 2011 13:33:51 +0000 Subject: [PATCH] --- yaml --- r: 266423 b: refs/heads/master c: 3fbaa3ac0d47e0cbad9bb65f0b71a5ce3ef1b76c h: refs/heads/master i: 266421: b19a4066118742946319fd9302c4b2f23000d321 266419: 2441239fc5d2e143aad56536f69b225d4f6c7be6 266415: 97fca5bb94b7ae199c6ab50a9a49b89a7c1f4373 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ecb248ba2028..709084801c6a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7edebf9a6aac07e2ebb3901b60672293a7139ad0 +refs/heads/master: 3fbaa3ac0d47e0cbad9bb65f0b71a5ce3ef1b76c diff --git a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c index f7ca3511b9fe..cf3c227f9643 100644 --- a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c +++ b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c @@ -1205,7 +1205,7 @@ s32 ixgbe_write_i2c_eeprom_generic(struct ixgbe_hw *hw, u8 byte_offset, * @data: value read * * Performs byte read operation to SFP module's EEPROM over I2C interface at - * a specified deivce address. + * a specified device address. **/ s32 ixgbe_read_i2c_byte_generic(struct ixgbe_hw *hw, u8 byte_offset, u8 dev_addr, u8 *data) @@ -1215,6 +1215,7 @@ s32 ixgbe_read_i2c_byte_generic(struct ixgbe_hw *hw, u8 byte_offset, u32 retry = 0; u16 swfw_mask = 0; bool nack = 1; + *data = 0; if (IXGBE_READ_REG(hw, IXGBE_STATUS) & IXGBE_STATUS_LAN_ID_1) swfw_mask = IXGBE_GSSR_PHY1_SM;