aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/wl12xx/wl1251_main.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1251_main.c b/drivers/net/wireless/wl12xx/wl1251_main.c
index 4728983b4383..f17ce06b6c24 100644
--- a/drivers/net/wireless/wl12xx/wl1251_main.c
+++ b/drivers/net/wireless/wl12xx/wl1251_main.c
@@ -946,7 +946,7 @@ static void wl1251_op_bss_info_changed(struct ieee80211_hw *hw,
946 skb->data, skb->len); 946 skb->data, skb->len);
947 dev_kfree_skb(skb); 947 dev_kfree_skb(skb);
948 if (ret < 0) 948 if (ret < 0)
949 goto out; 949 goto out_sleep;
950 950
951 if (wl->bss_type != BSS_TYPE_IBSS) { 951 if (wl->bss_type != BSS_TYPE_IBSS) {
952 ret = wl1251_join(wl, wl->bss_type, wl->channel, 952 ret = wl1251_join(wl, wl->bss_type, wl->channel,
@@ -1018,7 +1018,7 @@ static void wl1251_op_bss_info_changed(struct ieee80211_hw *hw,
1018 ret = wl1251_acx_cts_protect(wl, CTSPROTECT_DISABLE); 1018 ret = wl1251_acx_cts_protect(wl, CTSPROTECT_DISABLE);
1019 if (ret < 0) { 1019 if (ret < 0) {
1020 wl1251_warning("Set ctsprotect failed %d", ret); 1020 wl1251_warning("Set ctsprotect failed %d", ret);
1021 goto out; 1021 goto out_sleep;
1022 } 1022 }
1023 } 1023 }
1024 1024
@@ -1029,7 +1029,7 @@ static void wl1251_op_bss_info_changed(struct ieee80211_hw *hw,
1029 1029
1030 if (ret < 0) { 1030 if (ret < 0) {
1031 dev_kfree_skb(beacon); 1031 dev_kfree_skb(beacon);
1032 goto out; 1032 goto out_sleep;
1033 } 1033 }
1034 1034
1035 ret = wl1251_cmd_template_set(wl, CMD_PROBE_RESP, beacon->data, 1035 ret = wl1251_cmd_template_set(wl, CMD_PROBE_RESP, beacon->data,
@@ -1038,13 +1038,13 @@ static void wl1251_op_bss_info_changed(struct ieee80211_hw *hw,
1038 dev_kfree_skb(beacon); 1038 dev_kfree_skb(beacon);
1039 1039
1040 if (ret < 0) 1040 if (ret < 0)
1041 goto out; 1041 goto out_sleep;
1042 1042
1043 ret = wl1251_join(wl, wl->bss_type, wl->beacon_int, 1043 ret = wl1251_join(wl, wl->bss_type, wl->beacon_int,
1044 wl->channel, wl->dtim_period); 1044 wl->channel, wl->dtim_period);
1045 1045
1046 if (ret < 0) 1046 if (ret < 0)
1047 goto out; 1047 goto out_sleep;
1048 } 1048 }
1049 1049
1050out_sleep: 1050out_sleep: