From 8f54f299eaf82cc1a509a7ce461b1d69b8e562d0 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Mon, 3 Aug 2009 21:10:01 -0700
Subject: [PATCH] --- yaml --- r: 156362 b: refs/heads/master c:
 0cb13536c3382004bd9b833565e2af33f26ed1fb h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/net/3c59x.c | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index c9cfd849d6c3..730d5bb26370 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eca4c3d2dd66d0230140c9af05dee591df6f0e42
+refs/heads/master: 0cb13536c3382004bd9b833565e2af33f26ed1fb
diff --git a/trunk/drivers/net/3c59x.c b/trunk/drivers/net/3c59x.c
index c34aee91250b..c20416850948 100644
--- a/trunk/drivers/net/3c59x.c
+++ b/trunk/drivers/net/3c59x.c
@@ -2721,13 +2721,15 @@ dump_tx_ring(struct net_device *dev)
 				   &vp->tx_ring[vp->dirty_tx % TX_RING_SIZE]);
 			issue_and_wait(dev, DownStall);
 			for (i = 0; i < TX_RING_SIZE; i++) {
-				pr_err("  %d: @%p  length %8.8x status %8.8x\n", i,
-					   &vp->tx_ring[i],
+				unsigned int length;
+
 #if DO_ZEROCOPY
-					   le32_to_cpu(vp->tx_ring[i].frag[0].length),
+				length = le32_to_cpu(vp->tx_ring[i].frag[0].length);
 #else
-					   le32_to_cpu(vp->tx_ring[i].length),
+				length = le32_to_cpu(vp->tx_ring[i].length);
 #endif
+				pr_err("  %d: @%p  length %8.8x status %8.8x\n",
+					   i, &vp->tx_ring[i], length,
 					   le32_to_cpu(vp->tx_ring[i].status));
 			}
 			if (!stalled)