projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
af24640
)
bnx2x: Read chip ID
author
Eilon Greenstein
<eilong@broadcom.com>
Wed, 14 Jan 2009 06:44:04 +0000
(06:44 +0000)
committer
David S. Miller
<davem@davemloft.net>
Tue, 20 Jan 2009 00:20:10 +0000
(16:20 -0800)
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/bnx2x_main.c
patch
|
blob
|
history
diff --git
a/drivers/net/bnx2x_main.c
b/drivers/net/bnx2x_main.c
index
8f8271d
..
7ee6a21
100644
(file)
--- a/
drivers/net/bnx2x_main.c
+++ b/
drivers/net/bnx2x_main.c
@@
-6975,7
+6975,7
@@
static void __devinit bnx2x_get_common_hwinfo(struct bnx2x *bp)
id |= ((val & 0xf) << 12);
val = REG_RD(bp, MISC_REG_CHIP_METAL);
id |= ((val & 0xff) << 4);
- REG_RD(bp, MISC_REG_BOND_ID);
+
val =
REG_RD(bp, MISC_REG_BOND_ID);
id |= (val & 0xf);
bp->common.chip_id = id;
bp->link_params.chip_id = bp->common.chip_id;