]>
Commit | Line | Data |
---|---|---|
2cb7cef9 BS |
1 | From 5a40e08e666e8caa1227333de41fd1e2cd84d4f5 Mon Sep 17 00:00:00 2001 |
2 | From: Eilon Greenstein <eilong@broadcom.com> | |
3 | Date: Wed, 14 Jan 2009 06:44:04 +0000 | |
4 | Subject: bnx2x: Read chip ID | |
5 | Acked-by: Karsten Keil <kkeil@novell.com> | |
6 | Reference: bnc#472500 | |
7 | ||
8 | Signed-off-by: Eilon Greenstein <eilong@broadcom.com> | |
9 | Signed-off-by: David S. Miller <davem@davemloft.net> | |
10 | --- | |
11 | drivers/net/bnx2x_main.c | 2 +- | |
12 | 1 files changed, 1 insertions(+), 1 deletions(-) | |
13 | ||
14 | Index: linux-2.6.27-bnx2x_2/drivers/net/bnx2x_main.c | |
15 | =================================================================== | |
16 | --- linux-2.6.27-bnx2x_2.orig/drivers/net/bnx2x_main.c | |
17 | +++ linux-2.6.27-bnx2x_2/drivers/net/bnx2x_main.c | |
18 | @@ -6978,7 +6978,7 @@ static void __devinit bnx2x_get_common_h | |
19 | id |= ((val & 0xf) << 12); | |
20 | val = REG_RD(bp, MISC_REG_CHIP_METAL); | |
21 | id |= ((val & 0xff) << 4); | |
22 | - REG_RD(bp, MISC_REG_BOND_ID); | |
23 | + val = REG_RD(bp, MISC_REG_BOND_ID); | |
24 | id |= (val & 0xf); | |
25 | bp->common.chip_id = id; | |
26 | bp->link_params.chip_id = bp->common.chip_id; |