Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git

[linux-2.6-block.git] / drivers / net / wireless / ath / ath10k / coredump.c

diff --git a/drivers/net/wireless/ath/ath10k/coredump.c b/drivers/net/wireless/ath/ath10k/coredump.c
index 7825b6a1b1043a29f8820eb57472385e03d39c2b..b6d2932383cf654737a2492ca9fa920ba68a5fa3 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/coredump.c
+++ b/drivers/net/wireless/ath/ath10k/coredump.c
@@ -1102,7 +1102,7 @@ struct ath10k_fw_crash_data *ath10k_coredump_new(struct ath10k *ar)
 {
        struct ath10k_fw_crash_data *crash_data = ar->coredump.fw_crash_data;
 
-       lockdep_assert_held(&ar->data_lock);
+       lockdep_assert_held(&ar->dump_mutex);
 
        if (ath10k_coredump_mask == 0)
                /* coredump disabled */
@@ -1146,7 +1146,7 @@ static struct ath10k_dump_file_data *ath10k_coredump_build(struct ath10k *ar)
        if (!buf)
                return NULL;
 
-       spin_lock_bh(&ar->data_lock);
+       mutex_lock(&ar->dump_mutex);
 
        dump_data = (struct ath10k_dump_file_data *)(buf);
        strlcpy(dump_data->df_magic, "ATH10K-FW-DUMP",
@@ -1213,7 +1213,7 @@ static struct ath10k_dump_file_data *ath10k_coredump_build(struct ath10k *ar)
                sofar += sizeof(*dump_tlv) + crash_data->ramdump_buf_len;
        }
 
-       spin_unlock_bh(&ar->data_lock);
+       mutex_unlock(&ar->dump_mutex);
 
        return dump_data;
 }