aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath6kl
diff options
context:
space:
mode:
authorJames Minor <james.minor@ni.com>2016-10-03 13:00:04 -0500
committerKalle Valo <kvalo@qca.qualcomm.com>2016-10-06 10:14:45 +0300
commitfdb6e4839e3ad98b9b51be00e1f99d63db402030 (patch)
treebc904247efe40dec4cbf1aa7f66501a7dd3b349b /drivers/net/wireless/ath/ath6kl
parentath6kl: after cleanup properly reflect that sg is disabled (diff)
downloadlinux-dev-fdb6e4839e3ad98b9b51be00e1f99d63db402030.tar.xz
linux-dev-fdb6e4839e3ad98b9b51be00e1f99d63db402030.zip
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>
Diffstat (limited to 'drivers/net/wireless/ath/ath6kl')
-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 {
#define CMD53_ARG_FIXED_ADDRESS 0
#define CMD53_ARG_INCR_ADDRESS 1
+static int ath6kl_sdio_config(struct ath6kl *ar);
+
static inline struct ath6kl_sdio *ath6kl_sdio_priv(struct ath6kl *ar)
{
return ar->hif_priv;
@@ -526,8 +528,15 @@ static int ath6kl_sdio_power_on(struct ath6kl *ar)
*/
msleep(10);
+ ret = ath6kl_sdio_config(ar);
+ if (ret) {
+ ath6kl_err("Failed to config sdio: %d\n", ret);
+ goto out;
+ }
+
ar_sdio->is_disabled = false;
+out:
return ret;
}