From 1d1b69851b314aebfc6b4fe31fe789b58c498786 Mon Sep 17 00:00:00 2001 From: Richard Kennedy Date: Mon, 3 Nov 2008 11:13:48 +0000 Subject: [PATCH] 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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wlan-ng/prism2usb.c | 14 +++++++++----- 1 file 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: -- 2.11.4.GIT