Commit d156e67d authored by Luca Coelho's avatar Luca Coelho
Browse files

iwlwifi: mvm: fix merge damage in iwl_mvm_vif_dbgfs_register() 



When I rebased Greg's patch, I accidentally left the old if block that
was already there.  Remove it.

Fixes: 154d4899 ("iwlwifi: mvm: properly check debugfs dentry before using it")
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 5c9adef9

drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c

+0 −6
Original line number Diff line number Diff line
@@ -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)))

CRA Git | Maintained and supported by SUSTech CRA and CCSE