|
@@ -1696,10 +1696,16 @@ static int __ath6kl_init_hw_start(struct ath6kl *ar)
|
|
|
test_bit(WMI_READY,
|
|
|
&ar->flag),
|
|
|
WMI_TIMEOUT);
|
|
|
+ if (timeleft <= 0) {
|
|
|
+ clear_bit(WMI_READY, &ar->flag);
|
|
|
+ ath6kl_err("wmi is not ready or wait was interrupted: %ld\n",
|
|
|
+ timeleft);
|
|
|
+ ret = -EIO;
|
|
|
+ goto err_htc_stop;
|
|
|
+ }
|
|
|
|
|
|
ath6kl_dbg(ATH6KL_DBG_BOOT, "firmware booted\n");
|
|
|
|
|
|
-
|
|
|
if (test_and_clear_bit(FIRST_BOOT, &ar->flag)) {
|
|
|
ath6kl_info("%s %s fw %s api %d%s\n",
|
|
|
ar->hw.name,
|
|
@@ -1718,12 +1724,6 @@ static int __ath6kl_init_hw_start(struct ath6kl *ar)
|
|
|
goto err_htc_stop;
|
|
|
}
|
|
|
|
|
|
- if (!timeleft || signal_pending(current)) {
|
|
|
- ath6kl_err("wmi is not ready or wait was interrupted\n");
|
|
|
- ret = -EIO;
|
|
|
- goto err_htc_stop;
|
|
|
- }
|
|
|
-
|
|
|
ath6kl_dbg(ATH6KL_DBG_TRC, "%s: wmi is ready\n", __func__);
|
|
|
|
|
|
/* communicate the wmi protocol verision to the target */
|