diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/samsung/sxgbe/sxgbe_core.c | 6 |
1 files changed, 3 insertions, 3 deletions
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)); } |