From: Shahar S Matityahu Date: Thu, 13 Jun 2019 12:08:24 +0000 (+0300) Subject: iwlwifi: dbg_ini: move iwl_dbg_tlv_load_bin out of debug override ifdef X-Git-Tag: v5.2.11~108 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=250352ddc2b4c8e709bef227733f1c672e245789;p=users%2Fdwmw2%2Flinux.git iwlwifi: dbg_ini: move iwl_dbg_tlv_load_bin out of debug override ifdef [ Upstream commit 072b30642f90b01d139131ec7bf763778a3a3f41 ] ini debug mode should work even if debug override is not defined. Signed-off-by: Shahar S Matityahu Fixes: 68f6f492c4fa ("iwlwifi: trans: support loading ini TLVs from external file") Signed-off-by: Luca Coelho Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c index fba242284507b..efd4bf04d0162 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c @@ -1627,6 +1627,8 @@ struct iwl_drv *iwl_drv_start(struct iwl_trans *trans) init_completion(&drv->request_firmware_complete); INIT_LIST_HEAD(&drv->list); + iwl_load_fw_dbg_tlv(drv->trans->dev, drv->trans); + #ifdef CONFIG_IWLWIFI_DEBUGFS /* Create the device debugfs entries. */ drv->dbgfs_drv = debugfs_create_dir(dev_name(trans->dev),