diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 09:59:47 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 09:59:47 -0500 |
| commit | 5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834 (patch) | |
| tree | 7b72b66081d042a41dc822575503133364857ce2 /drivers/net/b44.c | |
| parent | e0ee98513d1a2e24d2ddbdecf4216bcca29d1158 (diff) | |
| parent | 6060e8df517847bf445ebc61de7d4d9c7faae990 (diff) | |
Merge branch 'pending-misc' (early part) into devel
Diffstat (limited to 'drivers/net/b44.c')
| -rw-r--r-- | drivers/net/b44.c | 3 |
1 files changed, 0 insertions, 3 deletions
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) | |||
| 912 | bp->istat = istat; | 912 | bp->istat = istat; |
| 913 | __b44_disable_ints(bp); | 913 | __b44_disable_ints(bp); |
| 914 | __napi_schedule(&bp->napi); | 914 | __napi_schedule(&bp->napi); |
| 915 | } else { | ||
| 916 | printk(KERN_ERR PFX "%s: Error, poll already scheduled\n", | ||
| 917 | dev->name); | ||
| 918 | } | 915 | } |
| 919 | 916 | ||
| 920 | irq_ack: | 917 | irq_ack: |