From 8b9e292f2c4b7891a61af1b815061ca87d04a21d Mon Sep 17 00:00:00 2001
From: Francois Romieu <romieu@fr.zoreil.com>
Date: Mon, 7 Nov 2005 01:52:57 +0100
Subject: [PATCH] --- yaml --- r: 13521 b: refs/heads/master c:
 6c2f4267833f453156f8f439cc32eb4c92f357b4 h: refs/heads/master i:   13519:
 71f1cffdb47a36fd2d92f63922f3fced8a5ac977 v: v3

---
 [refs]                  |  2 +-
 trunk/drivers/net/b44.c | 22 +++++++++-------------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index ebc7deb97d36..01d3b4d47051 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65b984f26f16e97168ee29e53145055412f38a23
+refs/heads/master: 6c2f4267833f453156f8f439cc32eb4c92f357b4
diff --git a/trunk/drivers/net/b44.c b/trunk/drivers/net/b44.c
index 09e1b4deae59..ecc2e32c38c1 100644
--- a/trunk/drivers/net/b44.c
+++ b/trunk/drivers/net/b44.c
@@ -1388,13 +1388,7 @@ static int b44_open(struct net_device *dev)
 
 	err = b44_alloc_consistent(bp);
 	if (err)
-		return err;
-
-	err = request_irq(dev->irq, b44_interrupt, SA_SHIRQ, dev->name, dev);
-	if (err)
-		goto err_out_free;
-
-	spin_lock_irq(&bp->lock);
+		goto out;
 
 	b44_init_rings(bp);
 	b44_init_hw(bp);
@@ -1403,7 +1397,13 @@ static int b44_open(struct net_device *dev)
 	netif_carrier_off(dev);
 	b44_check_phy(bp);
 
-	spin_unlock_irq(&bp->lock);
+	err = request_irq(dev->irq, b44_interrupt, SA_SHIRQ, dev->name, dev);
+	if (unlikely(err < 0)) {
+		b44_chip_reset(bp);
+		b44_free_rings(bp);
+		b44_free_consistent(bp);
+		goto out;
+	}
 
 	init_timer(&bp->timer);
 	bp->timer.expires = jiffies + HZ;
@@ -1412,11 +1412,7 @@ static int b44_open(struct net_device *dev)
 	add_timer(&bp->timer);
 
 	b44_enable_ints(bp);
-
-	return 0;
-
-err_out_free:
-	b44_free_consistent(bp);
+out:
 	return err;
 }