lkml.org 
[lkml]   [2019]   [Aug]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.2 058/162] iwlwifi: dbg_ini: move iwl_dbg_tlv_free outside of debugfs ifdef
    Date
    [ Upstream commit abcbef5977df1fb61026ba429964cd6b9a085699 ]

    The driver should call iwl_dbg_tlv_free even if debugfs is not defined
    since ini mode does not depend on debugfs ifdef.

    Signed-off-by: Shahar S Matityahu <shahar.s.matityahu@intel.com>
    Fixes: 68f6f492c4fa ("iwlwifi: trans: support loading ini TLVs from external file")
    Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
    index efd4bf04d0162..fa81ad67539f3 100644
    --- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
    +++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
    @@ -1649,8 +1649,8 @@ struct iwl_drv *iwl_drv_start(struct iwl_trans *trans)
    err_fw:
    #ifdef CONFIG_IWLWIFI_DEBUGFS
    debugfs_remove_recursive(drv->dbgfs_drv);
    - iwl_fw_dbg_free(drv->trans);
    #endif
    + iwl_fw_dbg_free(drv->trans);
    kfree(drv);
    err:
    return ERR_PTR(ret);
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-08-27 10:09    [W:4.118 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site