From: Emil Tantilov Date: Tue, 30 Aug 2011 13:33:51 +0000 (+0000) Subject: ixgbe: clear the data field in ixgbe_read_i2c_byte_generic X-Git-Tag: MMI-PSA29.97-13-9~18194^2~155 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3fbaa3ac0d47e0cbad9bb65f0b71a5ce3ef1b76c;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git ixgbe: clear the data field in ixgbe_read_i2c_byte_generic Clear the data field in ixgbe_read_i2c_byte_generic so it does not accumulate 1 bit using the same variable multiple times. Signed-off-by: Emil Tantilov Tested-by: Phil Schmitt Signed-off-by: Jeff Kirsher --- diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c index f7ca3511b9fe..cf3c227f9643 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c +++ b/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;