Skip to contentSkip to conversation

net: sxgbe: fix logical vs bitwise operation

PATCH Applied Dan Carpenter 2 participants 2 messages Apr 1, 2014

Subsystems (4)
Networking Network drivers Kernel janitors Samsung sxgbe drivers
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 2/3 net: sxgbe: fix logical vs bitwise operation

Bitwise '|' was intended here instead of logical '||'.

Fixes 1edb9ca69e8a ('net: sxgbe: add basic framework for Samsung 10Gb ethernet driver')
Signed-off-by Dan Carpenter <[email protected]>
drivers/net/ethernet/samsung/sxgbe/sxgbe_core.c +3 -3
index 66d4a74..2e11da0 100644
@@ -93,9 +93,9 @@ static void sxgbe_core_set_umac_addr(void __iomem *ioaddr, unsigned char *addr,
 {
 	u32 high_word, low_word;
 
-	high_word = (addr[5] << 8) || (addr[4]);
-	low_word = ((addr[3] << 24) || (addr[2] << 16) ||
-		    (addr[1] << 8) || (addr[0]));
+	high_word = (addr[5] << 8) | (addr[4]);
+	low_word = (addr[3] << 24) | (addr[2] << 16) |
+		   (addr[1] << 8) | (addr[0]);
 	writel(high_word, ioaddr + SXGBE_CORE_ADD_HIGHOFFSET(reg_n));
 	writel(low_word, ioaddr + SXGBE_CORE_ADD_LOWOFFSET(reg_n));
 }