Message ID | 20191012192536.797f1ede5077.Ice818674f107105ae05a6f561263c0896d49de2c@changeid (mailing list archive) |
---|---|
State | Accepted |
Delegated to: | Luca Coelho |
Headers | show |
Series | iwlwifi: updates intended for v5.5 2019-10-12-2 | expand |
Luca Coelho <luca@coelho.fi> writes: > From: Johannes Berg <johannes.berg@intel.com> > > ifxes=Ic930239af4832ecb04afbf92840c99dfd726eebe > > Signed-off-by: Johannes Berg <johannes.berg@intel.com> > Signed-off-by: Luca Coelho <luciano.coelho@intel.com> Quite cryptic commit log :)
On Wed, 2019-10-16 at 10:11 +0300, Kalle Valo wrote: > Luca Coelho <luca@coelho.fi> writes: > > > From: Johannes Berg <johannes.berg@intel.com> > > > > ifxes=Ic930239af4832ecb04afbf92840c99dfd726eebe > > > > Signed-off-by: Johannes Berg <johannes.berg@intel.com> > > Signed-off-by: Luca Coelho <luciano.coelho@intel.com> > > Quite cryptic commit log :) Hah! Sorry... there was a typo in our "fixes" tag, which caused my script not to trim it out and additionally it was merged without a proper description. If the "fixes" didn't have a typo, this patch would have been squashed with the one it's fixing, so not having a commit message wouldn't matter. It's supposed to fix "iwlwifi: dbg_ini: use new trigger TLV in dump flow", so I'll just squash it into that one. -- Luca.
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c index cc4627d27602..ce77ed17ede0 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c +++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c @@ -2379,8 +2379,7 @@ int iwl_fw_dbg_ini_collect(struct iwl_fw_runtime *fwrt, test_and_set_bit(fwrt->dump.wks[idx].idx, &fwrt->dump.active_wks)) return -EBUSY; - memcpy(&fwrt->dump.wks[idx].dump_data, dump_data, - sizeof(fwrt->dump.wks[idx].dump_data)); + fwrt->dump.wks[idx].dump_data = *dump_data; IWL_WARN(fwrt, "WRT: Collecting data: ini trigger %d fired.\n", tp_id);