Skip to content

Commit

Permalink
net/ixgbe/base: fix product version check
Browse files Browse the repository at this point in the history
[ upstream commit 1861e3a ]

The "and" condition offset == 0 && offset == NVM_INVALID_PTR
 can never be true.

Fixes: cf3af5a ("net/ixgbe/base: add functions to get version info")

Signed-off-by: Congwen Zhang <zhang.congwen@zte.com.cn>
Acked-by: Xiaolong Ye <xiaolong.ye@intel.com>
  • Loading branch information
Congwen Zhang authored and kevintraynor committed Sep 4, 2019
1 parent 62aa226 commit 7f74d18
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/net/ixgbe/base/ixgbe_common.c
Expand Up @@ -5040,7 +5040,7 @@ void ixgbe_get_oem_prod_version(struct ixgbe_hw *hw,
hw->eeprom.ops.read(hw, NVM_OEM_PROD_VER_PTR, &offset);

/* Return is offset to OEM Product Version block is invalid */
if (offset == 0x0 && offset == NVM_INVALID_PTR)
if (offset == 0x0 || offset == NVM_INVALID_PTR)
return;

/* Read product version block */
Expand Down

0 comments on commit 7f74d18

Please sign in to comment.