summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-11-30 00:13:28 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2009-12-18 13:43:53 -0800
commit88f921f674f5cca15fb550003d2d6cb83450e262 (patch)
treeddeac917e5b9ccca35c27a09f4dcca7a44e99bd5
parent74dd6a2e8c47d58c362408d5c7ffa225ce955dbf (diff)
b44: Fix wedge when using netconsole.
[ Upstream commit 0cae200eec6330cd2c20b24279597be1da50dc93 ] 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> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-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 24a79f463ff6..351a258dccd6 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -913,9 +913,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: