summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/samsung
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2014-04-01 16:39:00 +0300
committerDavid S. Miller <davem@davemloft.net>2014-04-01 16:25:52 -0400
commit4f6ed914f81e55be16bfec0b2e86873ead35a26d (patch)
tree04f4ba96b753774a7c8cac37449f2a15c4b4d9f5 /drivers/net/ethernet/samsung
parentca231f838870e9c83aaf2c0eff136150cd97b412 (diff)
downloadlinux-4f6ed914f81e55be16bfec0b2e86873ead35a26d.tar.bz2
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 <dan.carpenter@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/samsung')
-rw-r--r--drivers/net/ethernet/samsung/sxgbe/sxgbe_core.c6
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));
}