From ed2d520b5f45e0e6d4075d74cd0a1f96c4613465 Mon Sep 17 00:00:00 2001
From: David Sterba <dsterba@suse.cz>
Date: Wed, 29 Dec 2010 03:40:31 +0000
Subject: [PATCH] --- yaml --- r: 223764 b: refs/heads/master c:
 824f5f38d3005c346a043dedcfe8b048b699b81a h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/tg3.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2fbbf7a6aaba..42b2d656d2e7 100644
--- 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
index 30ccbb6d097a..6f97b7bbcbf1 100644
--- 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;