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

Commit 430e640d authored by Glen Lee's avatar Glen Lee Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: handle connecting error 



If connection fails, wilc1000_connecting needs to be set false also and return
immediately because goto lable 'done' doesn't do anything. Remove lable 'done'
as well.

Signed-off-by: default avatarGlen Lee <glen.lee@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ff9d65ab

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

+6 −7
Original line number Diff line number Diff line
@@ -757,8 +757,8 @@ static int connect(struct wiphy *wiphy, struct net_device *dev, 
			PRINT_D(CFG80211_DBG, "No Scan results yet\n");

		else

			PRINT_D(CFG80211_DBG, "Required bss not in scan results: Error(%d)\n", s32Error);



		goto done;

		wilc_connecting = 0;

		return s32Error;

	}



	priv->WILC_WFI_wep_default = 0;
@@ -845,8 +845,8 @@ static int connect(struct wiphy *wiphy, struct net_device *dev, 
		} else {

			s32Error = -ENOTSUPP;

			PRINT_ER("Not supported cipher: Error(%d)\n", s32Error);



			goto done;

			wilc_connecting = 0;

			return s32Error;

		}

	}
@@ -912,11 +912,10 @@ static int connect(struct wiphy *wiphy, struct net_device *dev, 
	if (s32Error != 0) {

		PRINT_ER("wilc_set_join_req(): Error(%d)\n", s32Error);

		s32Error = -ENOENT;

		goto done;

		wilc_connecting = 0;

		return s32Error;

	}



done:



	return s32Error;

}