From: Dan Carpenter Date: Tue, 1 Apr 2014 13:39:00 +0000 (+0300) Subject: net: sxgbe: fix logical vs bitwise operation X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4f6ed914f81e55be16bfec0b2e86873ead35a26d;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git 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 Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_core.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_core.c index 66d4a74a137c..2e11da00dac2 100644 --- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_core.c +++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_core.c @@ -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)); }