1 files changed, 11 insertions, 6 deletions

diff --git a/drivers/net/wireless/ath/ath6kl/sdio.c b/drivers/net/wireless/ath/ath6kl/sdio.c
index 44ea7a742101..05b95405f7b5 100644
--- a/drivers/net/wireless/ath/ath6kl/sdio.c
+++ b/drivers/net/wireless/ath/ath6kl/sdio.c
@@ -552,7 +552,7 @@ static int ath6kl_sdio_write_async(struct ath6kl *ar, u32 address, u8 *buffer,
 
         bus_req = ath6kl_sdio_alloc_busreq(ar_sdio);
 
-        if (!bus_req)
+        if (WARN_ON_ONCE(!bus_req))
                 return -ENOMEM;
 
         bus_req->address = address;
@@ -915,6 +915,9 @@ static int ath6kl_sdio_suspend(struct ath6kl *ar, struct cfg80211_wowlan *wow)
         }
 
 cut_pwr:
+        if (func->card && func->card->host)
+                func->card->host->pm_flags &= ~MMC_PM_KEEP_POWER;
+
         return ath6kl_cfg80211_suspend(ar, ATH6KL_CFG_SUSPEND_CUTPOWER, NULL);
 }
 
@@ -985,9 +988,8 @@ static int ath6kl_set_addrwin_reg(struct ath6kl *ar, u32 reg_addr, u32 addr)
         }
 
         if (status) {
-                ath6kl_err("%s: failed to write initial bytes of 0x%x "
-                           "to window reg: 0x%X\n", __func__,
-                           addr, reg_addr);
+                ath6kl_err("%s: failed to write initial bytes of 0x%x to window reg: 0x%X\n",
+                           __func__, addr, reg_addr);
                 return status;
         }
 
@@ -1076,8 +1078,8 @@ static int ath6kl_sdio_bmi_credits(struct ath6kl *ar)
                                          (u8 *)&ar->bmi.cmd_credits, 4,
                                          HIF_RD_SYNC_BYTE_INC);
                 if (ret) {
-                        ath6kl_err("Unable to decrement the command credit "
-                                                "count register: %d\n", ret);
+                        ath6kl_err("Unable to decrement the command credit count register: %d\n",
+                                   ret);
                         return ret;
                 }
 
@@ -1457,3 +1459,6 @@ MODULE_FIRMWARE(AR6004_HW_1_0_DEFAULT_BOARD_DATA_FILE);
 MODULE_FIRMWARE(AR6004_HW_1_1_FW_DIR "/" AR6004_HW_1_1_FIRMWARE_FILE);
 MODULE_FIRMWARE(AR6004_HW_1_1_BOARD_DATA_FILE);
 MODULE_FIRMWARE(AR6004_HW_1_1_DEFAULT_BOARD_DATA_FILE);
+MODULE_FIRMWARE(AR6004_HW_1_2_FW_DIR "/" AR6004_HW_1_2_FIRMWARE_FILE);
+MODULE_FIRMWARE(AR6004_HW_1_2_BOARD_DATA_FILE);
+MODULE_FIRMWARE(AR6004_HW_1_2_DEFAULT_BOARD_DATA_FILE);