|
@@ -1546,7 +1546,7 @@ static const char *ath6kl_init_get_hif_name(enum ath6kl_hif_type type)
|
|
|
return NULL;
|
|
|
}
|
|
|
|
|
|
-int ath6kl_init_hw_start(struct ath6kl *ar)
|
|
|
+static int __ath6kl_init_hw_start(struct ath6kl *ar)
|
|
|
{
|
|
|
long timeleft;
|
|
|
int ret, i;
|
|
@@ -1642,8 +1642,6 @@ int ath6kl_init_hw_start(struct ath6kl *ar)
|
|
|
goto err_htc_stop;
|
|
|
}
|
|
|
|
|
|
- ar->state = ATH6KL_STATE_ON;
|
|
|
-
|
|
|
return 0;
|
|
|
|
|
|
err_htc_stop:
|
|
@@ -1656,7 +1654,18 @@ err_power_off:
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-int ath6kl_init_hw_stop(struct ath6kl *ar)
|
|
|
+int ath6kl_init_hw_start(struct ath6kl *ar)
|
|
|
+{
|
|
|
+ int err;
|
|
|
+
|
|
|
+ err = __ath6kl_init_hw_start(ar);
|
|
|
+ if (err)
|
|
|
+ return err;
|
|
|
+ ar->state = ATH6KL_STATE_ON;
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
+static int __ath6kl_init_hw_stop(struct ath6kl *ar)
|
|
|
{
|
|
|
int ret;
|
|
|
|
|
@@ -1672,8 +1681,17 @@ int ath6kl_init_hw_stop(struct ath6kl *ar)
|
|
|
if (ret)
|
|
|
ath6kl_warn("failed to power off hif: %d\n", ret);
|
|
|
|
|
|
- ar->state = ATH6KL_STATE_OFF;
|
|
|
+ return 0;
|
|
|
+}
|
|
|
|
|
|
+int ath6kl_init_hw_stop(struct ath6kl *ar)
|
|
|
+{
|
|
|
+ int err;
|
|
|
+
|
|
|
+ err = __ath6kl_init_hw_stop(ar);
|
|
|
+ if (err)
|
|
|
+ return err;
|
|
|
+ ar->state = ATH6KL_STATE_OFF;
|
|
|
return 0;
|
|
|
}
|
|
|
|