summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVladimir Kondratiev <QCA_vkondrat@QCA.qualcomm.com>2015-07-30 13:51:55 +0300
committerKalle Valo <kvalo@qca.qualcomm.com>2015-08-06 09:42:51 +0300
commit67131a1dba5f45cee78e9de09605cbdda1a1ce6c (patch)
treea5ff81b22ad54034edcc49eb96629755a7a0214c
parent8ad6600fbdd699f0d7a3ec250d20256a7ec98889 (diff)
downloadblackbird-obmc-linux-67131a1dba5f45cee78e9de09605cbdda1a1ce6c.tar.gz
blackbird-obmc-linux-67131a1dba5f45cee78e9de09605cbdda1a1ce6c.zip
wil6210: skip HW version check for chip debugging
When loading with debug_fw flag, do not bail out on unknown chipId Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
-rw-r--r--drivers/net/wireless/ath/wil6210/main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/wil6210/main.c b/drivers/net/wireless/ath/wil6210/main.c
index c77ae1739afc..33a3e9b136d9 100644
--- a/drivers/net/wireless/ath/wil6210/main.c
+++ b/drivers/net/wireless/ath/wil6210/main.c
@@ -738,9 +738,6 @@ int wil_reset(struct wil6210_priv *wil, bool load_fw)
wil_dbg_misc(wil, "%s()\n", __func__);
- if (wil->hw_version == HW_VER_UNKNOWN)
- return -ENODEV;
-
WARN_ON(!mutex_is_locked(&wil->mutex));
WARN_ON(test_bit(wil_status_napi_en, wil->status));
@@ -755,6 +752,9 @@ int wil_reset(struct wil6210_priv *wil, bool load_fw)
return 0;
}
+ if (wil->hw_version == HW_VER_UNKNOWN)
+ return -ENODEV;
+
cancel_work_sync(&wil->disconnect_worker);
wil6210_disconnect(wil, NULL, WLAN_REASON_DEAUTH_LEAVING, false);
wil_bcast_fini(wil);
OpenPOWER on IntegriCloud