From: David S. Miller <davem@davemloft.net>
Date: Mon, 30 Nov 2009 08:13:28 +0000 (-0800)
Subject: b44: Fix wedge when using netconsole.
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0cae200eec6330cd2c20b24279597be1da50dc93;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

b44: Fix wedge when using netconsole.

Fixes kernel bugzilla #14691

Due to the way netpoll works, it is perfectly legal to see
NAPI already scheduled when new device events are pending
in b44_interrupt().

So logging a message about it is wrong and in fact harmful.

Based upon a patch by Andreas Mohr.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index e046943ef29d..2a9132343b66 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -912,9 +912,6 @@ static irqreturn_t b44_interrupt(int irq, void *dev_id)
 			bp->istat = istat;
 			__b44_disable_ints(bp);
 			__napi_schedule(&bp->napi);
-		} else {
-			printk(KERN_ERR PFX "%s: Error, poll already scheduled\n",
-			       dev->name);
 		}
 
 irq_ack: