Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8c474d9 authored by Nicholas Krause's avatar Nicholas Krause Committed by Emmanuel Grumbach
Browse files

iwlwifi: Remove use of the deprecacted PTR_RET 



This removes the use of the two deprecated calls to the
macro PTR_RET in iwl_mvm_get_regdomain and replaces them
both to PTR_ERR_OR_ZERO.

Signed-off-by: default avatarNicholas Krause <xerofoify@gmail.com>
[Commit message editing]
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent c779273b

drivers/net/wireless/iwlwifi/mvm/mac80211.c

+2 −2
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ struct ieee80211_regdomain *iwl_mvm_get_regdomain(struct wiphy *wiphy, 
	resp = iwl_mvm_update_mcc(mvm, alpha2, src_id);

	if (IS_ERR_OR_NULL(resp)) {

		IWL_DEBUG_LAR(mvm, "Could not get update from FW %d\n",

			      PTR_RET(resp));

			      PTR_ERR_OR_ZERO(resp));

		goto out;

	}
@@ -334,7 +334,7 @@ struct ieee80211_regdomain *iwl_mvm_get_regdomain(struct wiphy *wiphy, 
	kfree(resp);

	if (IS_ERR_OR_NULL(regd)) {

		IWL_DEBUG_LAR(mvm, "Could not get parse update from FW %d\n",

			      PTR_RET(regd));

			      PTR_ERR_OR_ZERO(regd));

		goto out;

	}