Skip to contentSkip to conversation

ixgbe: Fix && vs || typo

PATCH New Dan Carpenter 2 participants 2 messages Jan 11, 2018 – Jan 12, 2018

Subsystems (3)
Network drivers Kernel janitors Intel Ethernet
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 ixgbe: Fix && vs || typo

"offset" can't be both 0x0 and 0xFFFF so presumably || was intended instead of &&. That matches with how this check is done in other functions.

Fixes 73834aec7199 ("ixgbe: extend firmware version support")
Signed-off-by Dan Carpenter <[email protected]>
drivers/net/ethernet/intel/ixgbe/ixgbe_common.c +1 -1
index 1948e4208fb4..27de8a7f2aeb 100644
@@ -4084,7 +4084,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 */
#1 lore raw

PATCH 1/1 ixgbe: Fix && vs || typo

Quoted 9 lines

-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Dan Carpenter
Sent: Thursday, January 11, 2018 1:46 PM
To: Kirsher, Jeffrey T <[email protected]>; Greenwalt, Paul <[email protected]>
Cc: kernel-janitors at vger.kernel.org; intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH] ixgbe: Fix && vs || typo

Quoted 5 lines

"offset" can't be both 0x0 and 0xFFFF so presumably || was intended instead of &&. That matches with how this check is done in other functions.

Fixes 73834aec7199 ("ixgbe: extend firmware version support")
Signed-off-by Dan Carpenter <[email protected]>
Tested-by Andrew Bowers <[email protected]>