From 96d6f733acd0191c2b298eb42049d7fad15d068f Mon Sep 17 00:00:00 2001
From: "Ira W. Snyder" <kernel@irasnyder.com>
Date: Tue, 21 Nov 2006 17:44:31 -0800
Subject: [PATCH] --- yaml --- r: 41047 b: refs/heads/master c:
 12862086f24d7382b24379bbcbe0dadf12ca5945 h: refs/heads/master i:   41045:
 66b30f7bd167a371802e8c90f52e5387a225a0d5   41043:
 feb1817094d33a8c11858ab08ca4a524c106b8fc   41039:
 1fcea4bec63d93514849b5898aa61f934e70306c v: v3

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

diff --git a/[refs] b/[refs]
index a672b5208176..d9fd0ac38cd0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2776ff047229c3e7cee2454e2704dd6f98fa32f
+refs/heads/master: 12862086f24d7382b24379bbcbe0dadf12ca5945
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index 1dbdd6bb587b..c20bb998e0e5 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/drivers/net/tg3.c
@@ -6979,8 +6979,10 @@ static int tg3_open(struct net_device *dev)
 	tg3_full_lock(tp, 0);
 
 	err = tg3_set_power_state(tp, PCI_D0);
-	if (err)
+	if (err) {
+		tg3_full_unlock(tp);
 		return err;
+	}
 
 	tg3_disable_ints(tp);
 	tp->tg3_flags &= ~TG3_FLAG_INIT_COMPLETE;