Skip to content

Commit

Permalink
Staging: wlan-ng: prism2_usb.c always enable the card in probe_usb
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Richard Kennedy authored and Greg Kroah-Hartman committed Jan 6, 2009
1 parent ee31352 commit 1d1b698
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions drivers/staging/wlan-ng/prism2usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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:
Expand Down

0 comments on commit 1d1b698

Please sign in to comment.