]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
iwlwifi: mvm: fix merge damage in iwl_mvm_vif_dbgfs_register()
authorLuca Coelho <luciano.coelho@intel.com>
Thu, 25 Apr 2019 07:03:34 +0000 (10:03 +0300)
committerLuca Coelho <luciano.coelho@intel.com>
Sun, 28 Apr 2019 06:59:59 +0000 (09:59 +0300)
When I rebased Greg's patch, I accidentally left the old if block that
was already there.  Remove it.

Fixes: 154d4899e411 ("iwlwifi: mvm: properly check debugfs dentry before using it")
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c

index 738eddb2e7acb89ea4131e2559ab4dc554e90b3d..6925527d8457a294ff423547d86511e5a2718ae8 100644 (file)
@@ -780,12 +780,6 @@ void iwl_mvm_vif_dbgfs_register(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
                return;
        }
 
-       if (!mvmvif->dbgfs_dir) {
-               IWL_ERR(mvm, "Failed to create debugfs directory under %pd\n",
-                       dbgfs_dir);
-               return;
-       }
-
        if (iwlmvm_mod_params.power_scheme != IWL_POWER_SCHEME_CAM &&
            ((vif->type == NL80211_IFTYPE_STATION && !vif->p2p) ||
             (vif->type == NL80211_IFTYPE_STATION && vif->p2p)))