aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Kennedy <richard@rsk.demon.co.uk>2008-11-03 11:13:48 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2009-01-06 13:51:58 -0800
commit1d1b69851b314aebfc6b4fe31fe789b58c498786 (patch)
tree15c0dd7d7ec965ca6145895a48d45a405c3dd526
parentee313528d96cbd9eda568fec11fb6fdae13d30a4 (diff)
Staging: wlan-ng: prism2_usb.c always enable the card in probe_usb
always enable card in probe_usb & update register_wlandev to match latest wlan-ng-dev tree. Signed-off-by: Richard Kennedy <richard@rsk.demon.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/wlan-ng/prism2usb.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/staging/wlan-ng/prism2usb.c b/drivers/staging/wlan-ng/prism2usb.c
index 8d4959f514a..8f7b1f281f0 100644
--- a/drivers/staging/wlan-ng/prism2usb.c
+++ b/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: