aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-11-30 00:13:28 -0800
committerDavid S. Miller <davem@davemloft.net>2009-11-30 00:13:28 -0800
commit0cae200eec6330cd2c20b24279597be1da50dc93 (patch)
tree89888a49f4eb1814c2ebabcfd2d5a3fa25ed9de8
parent40be261dfd8bfba4baeff40168d44a6a4450ace1 (diff)
downloadkernel_goldelico_gta04-0cae200eec6330cd2c20b24279597be1da50dc93.zip
kernel_goldelico_gta04-0cae200eec6330cd2c20b24279597be1da50dc93.tar.gz
kernel_goldelico_gta04-0cae200eec6330cd2c20b24279597be1da50dc93.tar.bz2
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>
-rw-r--r--drivers/net/b44.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index e046943..2a91323 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: