---

yaml --- r: 126614 b: refs/heads/master c: 1d1b698 h: refs/heads/master v: v3
git-mirror · Jan 6, 2009 · 92a55d5 · 92a55d5
1 parent 36cb24d
commit 92a55d5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee313528d96cbd9eda568fec11fb6fdae13d30a4
+refs/heads/master: 1d1b69851b314aebfc6b4fe31fe789b58c498786
diff --git a/trunk/drivers/staging/wlan-ng/prism2usb.c b/trunk/drivers/staging/wlan-ng/prism2usb.c
@@ -110,11 +110,6 @@ static int prism2sta_probe_usb(
 	 * linux netdevice.
 	 */
 	SET_NETDEV_DEV(wlandev->netdev, &(interface->dev));
-        if ( register_wlandev(wlandev) != 0 ) {
-		WLAN_LOG_ERROR("%s: register_wlandev() failed.\n", dev_info);
-		result = -EIO;
-		goto failed;
-        }
 
 	/* Do a chip-level reset on the MAC */
 	if (prism2_doreset) {
@@ -136,6 +131,15 @@ static int prism2sta_probe_usb(
 
 	wlandev->msdstate = WLAN_MSD_HWPRESENT;
 
+        if ( register_wlandev(wlandev) != 0 ) {
+		WLAN_LOG_ERROR("%s: register_wlandev() failed.\n", dev_info);
+		result = -EIO;
+		goto failed;
+        }
+
+/* enable the card */
+	prism2sta_ifstate(wlandev, P80211ENUM_ifstate_enable);
+
 	goto done;
 
  failed: