diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 21:17:37 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 21:17:37 -0600 |
| commit | 06d8bf64ba25db42fcc60d2da2268ac22af94e77 (patch) | |
| tree | eb80eebf368957df18c2a4c0ee02897e0a9b06d2 /drivers/net/amd8111e.c | |
| parent | 8f68abbfd9703e58920ff07d314a48654ed0bc3b (diff) | |
| parent | 5986a2ec35836a878350c54af4bd91b1de6abc59 (diff) | |
Merge branch 'master' into for_paulus
Diffstat (limited to 'drivers/net/amd8111e.c')
| -rw-r--r-- | drivers/net/amd8111e.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c index 18896f24d407..9c399aaefbdd 100644 --- a/drivers/net/amd8111e.c +++ b/drivers/net/amd8111e.c @@ -1334,8 +1334,7 @@ err_no_interrupt: static void amd8111e_poll(struct net_device *dev) { unsigned long flags; - local_save_flags(flags); - local_irq_disable(); + local_irq_save(flags); amd8111e_interrupt(0, dev); local_irq_restore(flags); } |