diff --git a/[refs] b/[refs]
index e9d50c1f06f2..3c04407aaf85 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c73b1d1f26d4c9d54b49526edf9ee958ee5b80c1
+refs/heads/master: 759afc31332aed66bde20743e7e2d1e47b08aaeb
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index db606b603884..26ffb67f1da2 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/drivers/net/tg3.c
@@ -8781,7 +8781,7 @@ static int tg3_phys_id(struct net_device *dev, u32 data)
 		return -EAGAIN;
 
 	if (data == 0)
-		data = 2;
+		data = UINT_MAX / 2;
 
 	for (i = 0; i < (data * 2); i++) {
 		if ((i % 2) == 0)