Commit c6ebb5b6 authored by Dan Carpenter's avatar Dan Carpenter Committed by Johannes Berg
Browse files

wifi: iwlwifi: Fix some error codes 



This saves the error as PTR_ERR(wifi_pkg).  The problem is that
"wifi_pkg" is a valid pointer, not an error pointer.  Set the error code
to -EINVAL instead.

Fixes: 2a808414 ("iwlwifi: acpi: support reading and storing WRDS revision 1 and 2")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Link: https://msgid.link/9620bb77-2d7c-4d76-b255-ad824ebf8e35@moroto.mountain


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 3012477c

drivers/net/wireless/intel/iwlwifi/fw/acpi.c

+6 −6
Original line number Diff line number Diff line
@@ -618,7 +618,7 @@ int iwl_sar_get_wrds_table(struct iwl_fw_runtime *fwrt) 
					 &tbl_rev);

	if (!IS_ERR(wifi_pkg)) {

		if (tbl_rev != 2) {

			ret = PTR_ERR(wifi_pkg);

			ret = -EINVAL;

			goto out_free;

		}
@@ -634,7 +634,7 @@ int iwl_sar_get_wrds_table(struct iwl_fw_runtime *fwrt) 
					 &tbl_rev);

	if (!IS_ERR(wifi_pkg)) {

		if (tbl_rev != 1) {

			ret = PTR_ERR(wifi_pkg);

			ret = -EINVAL;

			goto out_free;

		}
@@ -650,7 +650,7 @@ int iwl_sar_get_wrds_table(struct iwl_fw_runtime *fwrt) 
					 &tbl_rev);

	if (!IS_ERR(wifi_pkg)) {

		if (tbl_rev != 0) {

			ret = PTR_ERR(wifi_pkg);

			ret = -EINVAL;

			goto out_free;

		}
@@ -707,7 +707,7 @@ int iwl_sar_get_ewrd_table(struct iwl_fw_runtime *fwrt) 
					 &tbl_rev);

	if (!IS_ERR(wifi_pkg)) {

		if (tbl_rev != 2) {

			ret = PTR_ERR(wifi_pkg);

			ret = -EINVAL;

			goto out_free;

		}
@@ -723,7 +723,7 @@ int iwl_sar_get_ewrd_table(struct iwl_fw_runtime *fwrt) 
					 &tbl_rev);

	if (!IS_ERR(wifi_pkg)) {

		if (tbl_rev != 1) {

			ret = PTR_ERR(wifi_pkg);

			ret = -EINVAL;

			goto out_free;

		}
@@ -739,7 +739,7 @@ int iwl_sar_get_ewrd_table(struct iwl_fw_runtime *fwrt) 
					 &tbl_rev);

	if (!IS_ERR(wifi_pkg)) {

		if (tbl_rev != 0) {

			ret = PTR_ERR(wifi_pkg);

			ret = -EINVAL;

			goto out_free;

		}