From 0f7e10992238eff0cc6c3cc9dda001c49c7936a6 Mon Sep 17 00:00:00 2001
From: Zhu Yi <yi.zhu@intel.com>
Date: Mon, 21 Aug 2006 11:38:52 +0800
Subject: [PATCH] --- yaml --- r: 35251 b: refs/heads/master c:
 efbd809829001c94e48b96337ea05a16d5ecee85 h: refs/heads/master i:   35249:
 d00a8b2ffa1d9ccf2ac7d40e2f0e4a86bb2ce686   35247:
 85d416724214c8a6b8dc97c5304c1fba072487e6 v: v3

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

diff --git a/[refs] b/[refs]
index d811607d9f5d..154bc8cd399e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8c22c942e46ca0e06fc7c72845314da1ad41702
+refs/heads/master: efbd809829001c94e48b96337ea05a16d5ecee85
diff --git a/trunk/drivers/net/wireless/ipw2100.c b/trunk/drivers/net/wireless/ipw2100.c
index e955db435b30..5d5dab6a209c 100644
--- a/trunk/drivers/net/wireless/ipw2100.c
+++ b/trunk/drivers/net/wireless/ipw2100.c
@@ -6254,13 +6254,14 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
 	 * member to call a function that then just turns and calls ipw2100_up.
 	 * net_dev->init is called after name allocation but before the
 	 * notifier chain is called */
-	mutex_lock(&priv->action_mutex);
 	err = register_netdev(dev);
 	if (err) {
 		printk(KERN_WARNING DRV_NAME
 		       "Error calling register_netdev.\n");
-		goto fail_unlock;
+		goto fail;
 	}
+
+	mutex_lock(&priv->action_mutex);
 	registered = 1;
 
 	IPW_DEBUG_INFO("%s: Bound to %s\n", dev->name, pci_name(pci_dev));