From e7c8de2333afb487d44e579515a63c8543c06ad8 Mon Sep 17 00:00:00 2001
From: Jiri Kosina <jkosina@suse.cz>
Date: Mon, 5 Feb 2007 16:29:49 -0800
Subject: [PATCH] --- yaml --- r: 46586 b: refs/heads/master c:
 b7e36bfa9ffa2f6097b622ba07a95d823db553e4 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/net/amd8111e.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 96f7927a5cbf..e8dd070bf685 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d38ff1d3d34ca9ae2a61cf98cf47530f9d51dee
+refs/heads/master: b7e36bfa9ffa2f6097b622ba07a95d823db553e4
diff --git a/trunk/drivers/net/amd8111e.c b/trunk/drivers/net/amd8111e.c
index 18896f24d407..9c399aaefbdd 100644
--- a/trunk/drivers/net/amd8111e.c
+++ b/trunk/drivers/net/amd8111e.c
@@ -1334,8 +1334,7 @@ static irqreturn_t amd8111e_interrupt(int irq, void *dev_id)
 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);
 }