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;