diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-11 22:32:31 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-11 22:32:31 +0200 |
| commit | 62522d36d74a843e78d17f2dffc90468c6762803 (patch) | |
| tree | d9d21de6724425c1b0ba12991e0865556aeda6b4 /drivers/net/8139cp.c | |
| parent | ethoc: use devres resource management (diff) | |
| parent | Merge branch 'wimax-2.6.35.y' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | linux-62522d36d74a843e78d17f2dffc90468c6762803.tar.xz linux-62522d36d74a843e78d17f2dffc90468c6762803.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/8139cp.c')
| -rw-r--r-- | drivers/net/8139cp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c index e949ba80127d..4a4f6b81e32d 100644 --- a/drivers/net/8139cp.c +++ b/drivers/net/8139cp.c @@ -598,8 +598,8 @@ rx_next: goto rx_status_loop; spin_lock_irqsave(&cp->lock, flags); - cpw16_f(IntrMask, cp_intr_mask); __napi_complete(napi); + cpw16_f(IntrMask, cp_intr_mask); spin_unlock_irqrestore(&cp->lock, flags); } |