staging: wilc1000: remove goto from mac_open

This patch removes goto from mac_open function. If address is invalid, goto
handles deinit process and return result.
So, just call deinit process and return the error value directly instead of
goto statement.

Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index 3c8155ec657c91d49a1aa521cbed75ec428c9396..6492103f6bb19121c850ae13c808b40edc2b2e6a 100644 (file)
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -1124,8 +1124,9 @@ int mac_open(struct net_device *ndev)
 
        if (!is_valid_ether_addr(ndev->dev_addr)) {
                PRINT_ER("Error: Wrong MAC address\n");
-               ret = -EINVAL;
-               goto _err_;
+               wilc_deinit_host_int(ndev);
+               wilc1000_wlan_deinit(ndev);
+               return -EINVAL;
        }
 
        wilc_mgmt_frame_register(nic->wilc_netdev->ieee80211_ptr->wiphy,
@@ -1140,11 +1141,6 @@ int mac_open(struct net_device *ndev)
        wl->open_ifcs++;
        nic->mac_opened = 1;
        return 0;
-
-_err_:
-       wilc_deinit_host_int(ndev);
-       wilc1000_wlan_deinit(ndev);
-       return ret;
 }
 
 struct net_device_stats *mac_stats(struct net_device *dev)