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: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 6ebe07e80acd734bbef55947096cb156aeae3403..744b77120b86d029b655d4c5ed4626f946e9aa50 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -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;
 }