From c485238b33f57b2a3e129c0626ce13db803fc831 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 31 Jul 2007 19:07:02 -0500
Subject: [PATCH] --- yaml --- r: 63715 b: refs/heads/master c:
 5845b677cf7f64a0f104609e1dfe02a439f69f71 h: refs/heads/master i:   63713:
 73ad9f3fd663b905cbd27d0e78c4dccaf2ed593a   63711:
 2cb0fb7bf067798ea2d436734a99fd3f7155464f v: v3

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

diff --git a/[refs] b/[refs]
index 4efe493f4832..5245fd46a1e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 092ed997c0c324a2e5e839da9f49453bb5227703
+refs/heads/master: 5845b677cf7f64a0f104609e1dfe02a439f69f71
diff --git a/trunk/drivers/net/atl1/atl1_main.c b/trunk/drivers/net/atl1/atl1_main.c
index 56f6389a300e..3c1984ecf36c 100644
--- a/trunk/drivers/net/atl1/atl1_main.c
+++ b/trunk/drivers/net/atl1/atl1_main.c
@@ -1704,10 +1704,8 @@ static int atl1_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
 		}
 	}
 
-	local_irq_save(flags);
-	if (!spin_trylock(&adapter->lock)) {
+	if (!spin_trylock_irqsave(&adapter->lock, flags)) {
 		/* Can't get lock - tell upper layer to requeue */
-		local_irq_restore(flags);
 		dev_printk(KERN_DEBUG, &adapter->pdev->dev, "tx locked\n");
 		return NETDEV_TX_LOCKED;
 	}