aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Minor <james.minor@ni.com>2016-10-03 14:00:04 -0400
committerKalle Valo <kvalo@qca.qualcomm.com>2016-10-06 03:14:45 -0400
commitfdb6e4839e3ad98b9b51be00e1f99d63db402030 (patch)
treebc904247efe40dec4cbf1aa7f66501a7dd3b349b
parentdb14b18a73a1ceaac96124e7918aa9e484f80dbb (diff)
ath6kl: configure SDIO when power is reapplied
When power is removed from the device, all of the SDIO settings return to default. Fix that by reconfiguring after power is applied. Signed-off-by: James Minor <james.minor@ni.com> Reviewed-by: Steve deRosier <steve.derosier@lairdtech.com> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
-rw-r--r--drivers/net/wireless/ath/ath6kl/sdio.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/sdio.c b/drivers/net/wireless/ath/ath6kl/sdio.c
index 8261e242fd1e..c2df075d2d56 100644
--- a/drivers/net/wireless/ath/ath6kl/sdio.c
+++ b/drivers/net/wireless/ath/ath6kl/sdio.c
@@ -75,6 +75,8 @@ struct ath6kl_sdio {
75#define CMD53_ARG_FIXED_ADDRESS 0 75#define CMD53_ARG_FIXED_ADDRESS 0
76#define CMD53_ARG_INCR_ADDRESS 1 76#define CMD53_ARG_INCR_ADDRESS 1
77 77
78static int ath6kl_sdio_config(struct ath6kl *ar);
79
78static inline struct ath6kl_sdio *ath6kl_sdio_priv(struct ath6kl *ar) 80static inline struct ath6kl_sdio *ath6kl_sdio_priv(struct ath6kl *ar)
79{ 81{
80 return ar->hif_priv; 82 return ar->hif_priv;
@@ -526,8 +528,15 @@ static int ath6kl_sdio_power_on(struct ath6kl *ar)
526 */ 528 */
527 msleep(10); 529 msleep(10);
528 530
531 ret = ath6kl_sdio_config(ar);
532 if (ret) {
533 ath6kl_err("Failed to config sdio: %d\n", ret);
534 goto out;
535 }
536
529 ar_sdio->is_disabled = false; 537 ar_sdio->is_disabled = false;
530 538
539out:
531 return ret; 540 return ret;
532} 541}
533 542