From c57fd3d4dcca2f38bbf769d365df39f71bdc55bf Mon Sep 17 00:00:00 2001
From: Jochen Friedrich <jochen@scram.de>
Date: Fri, 12 Feb 2010 10:11:54 +0000
Subject: [PATCH] --- yaml --- r: 184254 b: refs/heads/master c:
 f6ca057f1bfe251d944505fc5ba4df3762802539 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 908ce0c72f04..21f19988f1c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47d742752df4c1088589d4424840bc761613ab2a
+refs/heads/master: f6ca057f1bfe251d944505fc5ba4df3762802539
diff --git a/trunk/drivers/net/b44.c b/trunk/drivers/net/b44.c
index 9091c6574b1c..f21cbe63c7b1 100644
--- a/trunk/drivers/net/b44.c
+++ b/trunk/drivers/net/b44.c
@@ -189,11 +189,13 @@ static int b44_wait_bit(struct b44 *bp, unsigned long reg,
 		udelay(10);
 	}
 	if (i == timeout) {
-		printk(KERN_ERR PFX "%s: BUG!  Timeout waiting for bit %08x of register "
-		       "%lx to %s.\n",
-		       bp->dev->name,
-		       bit, reg,
-		       (clear ? "clear" : "set"));
+		if (net_ratelimit())
+			printk(KERN_ERR PFX "%s: BUG!  Timeout waiting for bit "
+			       "%08x of register "
+			       "%lx to %s.\n",
+			       bp->dev->name,
+			       bit, reg,
+			       (clear ? "clear" : "set"));
 		return -ENODEV;
 	}
 	return 0;