Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d1b6985 authored by Richard Kennedy's avatar Richard Kennedy Committed by Greg Kroah-Hartman
Browse files

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: default avatarRichard Kennedy <richard@rsk.demon.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ee313528

drivers/staging/wlan-ng/prism2usb.c

+9 −5
Original line number Diff line number Diff line
@@ -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: