diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-04 14:57:25 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-04 14:57:25 -0500 |
| commit | dbbe68bb12b34f3e450da7a73c20e6fa1f85d63a (patch) | |
| tree | 10f8363cbf5e428c0cb5614959e37b67a7e0cfa2 /drivers/net/tg3.c | |
| parent | 7b26e5ebd8b27b0126a84ae7f9a42aa8293d6c48 (diff) | |
| parent | 9fc3bbb4a752f108cf096d96640f3b548bbbce6c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/tg3.c')
| -rw-r--r-- | drivers/net/tg3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index e3d80c9fb86f..7841a8f69998 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
| @@ -12694,7 +12694,7 @@ static void __devinit tg3_read_vpd(struct tg3 *tp) | |||
| 12694 | cnt = pci_read_vpd(tp->pdev, pos, | 12694 | cnt = pci_read_vpd(tp->pdev, pos, |
| 12695 | TG3_NVM_VPD_LEN - pos, | 12695 | TG3_NVM_VPD_LEN - pos, |
| 12696 | &vpd_data[pos]); | 12696 | &vpd_data[pos]); |
| 12697 | if (cnt == -ETIMEDOUT || -EINTR) | 12697 | if (cnt == -ETIMEDOUT || cnt == -EINTR) |
| 12698 | cnt = 0; | 12698 | cnt = 0; |
| 12699 | else if (cnt < 0) | 12699 | else if (cnt < 0) |
| 12700 | goto out_not_found; | 12700 | goto out_not_found; |