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

Commit e111e968 authored by Johannes Berg's avatar Johannes Berg Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: simplify iwl_mvm_get_wakeup_status() return 



The return value in iwl_mvm_get_wakeup_status() is a bit unclear in
that it's not obvious that we don't leak fw_status in some cases.
Use fw_status directly with ERR_PTR() and return only it, that way
the compiler has a chance of proving that it's uninitialized (if it
ever is due to new changes.)

Additionally, this removes a smatch warning since smatch couldn't
figure out that fw_status can't, in fact, leak here.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 0c2ae049

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

+4 −4
Original line number Diff line number Diff line
@@ -1599,7 +1599,7 @@ iwl_mvm_get_wakeup_status(struct iwl_mvm *mvm, struct ieee80211_vif *vif) 


	/* RF-kill already asserted again... */

	if (!cmd.resp_pkt) {

		ret = -ERFKILL;

		fw_status = ERR_PTR(-ERFKILL);

		goto out_free_resp;

	}
@@ -1608,7 +1608,7 @@ iwl_mvm_get_wakeup_status(struct iwl_mvm *mvm, struct ieee80211_vif *vif) 
	len = iwl_rx_packet_payload_len(cmd.resp_pkt);

	if (len < status_size) {

		IWL_ERR(mvm, "Invalid WoWLAN status response!\n");

		ret = -EIO;

		fw_status = ERR_PTR(-EIO);

		goto out_free_resp;

	}
@@ -1616,7 +1616,7 @@ iwl_mvm_get_wakeup_status(struct iwl_mvm *mvm, struct ieee80211_vif *vif) 
	if (len != (status_size +

		    ALIGN(le32_to_cpu(status->wake_packet_bufsize), 4))) {

		IWL_ERR(mvm, "Invalid WoWLAN status response!\n");

		ret = -EIO;

		fw_status = ERR_PTR(-EIO);

		goto out_free_resp;

	}
@@ -1624,7 +1624,7 @@ iwl_mvm_get_wakeup_status(struct iwl_mvm *mvm, struct ieee80211_vif *vif) 


out_free_resp:

	iwl_free_resp(&cmd);

	return ret ? ERR_PTR(ret) : fw_status;

	return fw_status;

}



/* releases the MVM mutex */