Commit cd0fc658 authored Nov 26, 2018 by Shahar S Matityahu Committed by Luca Coelho Jan 29, 2019

iwlwifi: dbg_ini: properly handle ini user trigger



in case of a user trigger while ini is enable we change
FW_DBG_TRIGGER_USER to IWL_FW_TRIGGER_ID_USER_TRIGGER in
iwl_fw_dbg_collect and then again we attempt to do so in
_iwl_fw_error_ini_dump which causes to abort the dump.

Fix it by removing the second check in _iwl_fw_error_ini_dump.

Signed-off-by: Shahar S Matityahu <shahar.s.matityahu@intel.com>
Fixes: 7a14c23d ("iwlwifi: dbg: dump data according to the new ini TLVs")
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

parent 07a44b32

drivers/net/wireless/intel/iwlwifi/fw/dbg.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -1254,10 +1254,6 @@ _iwl_fw_error_ini_dump(struct iwl_fw_runtime *fwrt,

		if (id == FW_DBG_TRIGGER_FW_ASSERT)
		id = IWL_FW_TRIGGER_ID_FW_ASSERT;
		else if (id == FW_DBG_TRIGGER_USER)
		id = IWL_FW_TRIGGER_ID_USER_TRIGGER;
		else if (id < FW_DBG_TRIGGER_MAX)
		return NULL;

		if (WARN_ON(id >= ARRAY_SIZE(fwrt->dump.active_trigs)))
		return NULL;