---

yaml --- r: 223764 b: refs/heads/master c: 824f5f3 h: refs/heads/master v: v3
git-mirror · Dec 31, 2010 · ed2d520 · ed2d520
1 parent 9df11bc
commit ed2d520
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7e4c9775ea648deed4a8193951e50d0c7706173
+refs/heads/master: 824f5f38d3005c346a043dedcfe8b048b699b81a
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
@@ -12658,7 +12658,7 @@ static void __devinit tg3_read_vpd(struct tg3 *tp)
 			cnt = pci_read_vpd(tp->pdev, pos,
 					   TG3_NVM_VPD_LEN - pos,
 					   &vpd_data[pos]);
-			if (cnt == -ETIMEDOUT || -EINTR)
+			if (cnt == -ETIMEDOUT || cnt == -EINTR)
 				cnt = 0;
 			else if (cnt < 0)
 				goto out_not_found;