From fe48e1c8063b4ee4ee384a02fe5cca07c90d2fe5 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Mon, 29 Mar 2010 05:35:05 +0000
Subject: [PATCH] --- yaml --- r: 189503 b: refs/heads/master c:
 ce6fbdefb68d46db88170494b277551f955b48e2 h: refs/heads/master i:   189501:
 c9dfc56a68085737e90c655aac06a1c33202ab24   189499:
 3d616a4566885175fda118ea0be25469787c6690   189495:
 a17a7fb2f8d622221b7c1c01e3f050970884f20f   189487:
 b61356a7765fb10c6b2b1d205755d553a84d7fb4   189471:
 ab240d50b2a0920ab5984ef2d4d6c4880368feef   189439:
 0cbc7720731bb79fb60b9b8b5ddc7e7787ac988b v: v3

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

diff --git a/[refs] b/[refs]
index c886f54c28bb..ab73de2222aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ddc01b3b8ab224b346daf61976078b166f36b7e8
+refs/heads/master: ce6fbdefb68d46db88170494b277551f955b48e2
diff --git a/trunk/drivers/net/sgiseeq.c b/trunk/drivers/net/sgiseeq.c
index ed999d31f1fa..37f6a00cde17 100644
--- a/trunk/drivers/net/sgiseeq.c
+++ b/trunk/drivers/net/sgiseeq.c
@@ -592,8 +592,10 @@ static int sgiseeq_start_xmit(struct sk_buff *skb, struct net_device *dev)
 	/* Setup... */
 	len = skb->len;
 	if (len < ETH_ZLEN) {
-		if (skb_padto(skb, ETH_ZLEN))
+		if (skb_padto(skb, ETH_ZLEN)) {
+			spin_unlock_irqrestore(&sp->tx_lock, flags);
 			return NETDEV_TX_OK;
+		}
 		len = ETH_ZLEN;
 	}