aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bnx2x_main.c
diff options
context:
space:
mode:
authorEilon Greenstein <eilong@broadcom.com>2009-01-14 06:44:04 +0000
committerDavid S. Miller <davem@davemloft.net>2009-01-19 16:20:10 -0800
commit5a40e08e666e8caa1227333de41fd1e2cd84d4f5 (patch)
treef8cd70adaef7c9edddd6a9c478dff52000469511 /drivers/net/bnx2x_main.c
parentbnx2x: Wrong HDR offset in CAM (diff)
downloadlinux-dev-5a40e08e666e8caa1227333de41fd1e2cd84d4f5.tar.xz
linux-dev-5a40e08e666e8caa1227333de41fd1e2cd84d4f5.zip
bnx2x: Read chip ID
Signed-off-by: Eilon Greenstein <eilong@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2x_main.c')
-rw-r--r--drivers/net/bnx2x_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
index 8f8271d76db6..7ee6a211f9ba 100644
--- 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;