From: Dan Carpenter <dan.carpenter@oracle.com>
To: Byungho An <bh74.an@samsung.com>
Cc: Girish K S <ks.giri@samsung.com>,
Siva Reddy Kallam <siva.kallam@samsung.com>,
Vipul Pandya <vipul.pandya@samsung.com>,
netdev@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [patch 2/3] net: sxgbe: fix logical vs bitwise operation
Date: Tue, 1 Apr 2014 16:39:00 +0300 [thread overview]
Message-ID: <20140401133900.GB11536@mwanda> (raw)
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>
diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_core.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_core.c
index 66d4a74..2e11da0 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));
}
next reply other threads:[~2014-04-01 13:39 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-01 13:39 Dan Carpenter [this message]
2014-04-01 20:27 ` [patch 2/3] net: sxgbe: fix logical vs bitwise operation David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140401133900.GB11536@mwanda \
--to=dan.carpenter@oracle.com \
--cc=bh74.an@samsung.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=ks.giri@samsung.com \
--cc=netdev@vger.kernel.org \
--cc=siva.kallam@samsung.com \
--cc=vipul.pandya@samsung.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox