netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] b44: Ratelimit timeout error message.
@ 2010-02-12 20:11 Jochen Friedrich
  2010-02-17  7:37 ` David Miller
  0 siblings, 1 reply; 2+ messages in thread
From: Jochen Friedrich @ 2010-02-12 20:11 UTC (permalink / raw)
  To: Gary Zambrano; +Cc: netdev, Jochen Friedrich

Signed-off-by: Jochen Friedrich <jochen@scram.de>
---
 drivers/net/b44.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index 4869adb..499212e 100644
--- a/drivers/net/b44.c
+++ b/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;
-- 
1.6.6


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] b44: Ratelimit timeout error message.
  2010-02-12 20:11 [PATCH] b44: Ratelimit timeout error message Jochen Friedrich
@ 2010-02-17  7:37 ` David Miller
  0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2010-02-17  7:37 UTC (permalink / raw)
  To: jochen; +Cc: zambrano, netdev

From: Jochen Friedrich <jochen@scram.de>
Date: Fri, 12 Feb 2010 21:11:54 +0100

> Signed-off-by: Jochen Friedrich <jochen@scram.de>

Applied to net-next-2.6, thanks.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-02-17  7:37 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-12 20:11 [PATCH] b44: Ratelimit timeout error message Jochen Friedrich
2010-02-17  7:37 ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).