summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@linaro.org>2024-02-06 16:08:52 +0300
committeriwlwifi publisher <>2024-04-17 12:47:53 +0000
commit035c67f0d85719249cceb6e6b5ec73e3f0701caa (patch)
tree21fa301a773879b149362f8b05e6ef5d7302d28d
parentd34da2b1dffb2b0fec997a508074a8fc2ab8013e (diff)
downloadbackport-iwlwifi-035c67f0d85719249cceb6e6b5ec73e3f0701caa.tar.gz
wifi: iwlwifi: return negative -EINVAL instead of positive EINVAL
The '-' character is missing in -EINVAL. type=bugfix ticket=none fixes=Ib90bab74a9d56deb2362edb712294360e4ddae5b Fixes: fc7214c3c986 ("wifi: iwlwifi: read DSM functions from UEFI") Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> Link: https://msgid.link/f0391316-ab30-4664-96ac-03445ab2aeba@moroto.mountain Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com> Change-Id: I8be7b34c178ccfb04a9d4205a3828f953a15f265 Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/94334 tested: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> Reviewed-by: Johannes Berg <johannes.berg@intel.com> Tested-by: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> x-iwlwifi-stack-dev: 26955ca27344fa0fbd50ca223bd8a6251541cefb
-rw-r--r--drivers/net/wireless/intel/iwlwifi/fw/uefi.c2
-rw-r--r--versions2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/uefi.c b/drivers/net/wireless/intel/iwlwifi/fw/uefi.c
index b8591fa3f3..5c21701e52 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/uefi.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/uefi.c
@@ -687,7 +687,7 @@ int iwl_uefi_get_dsm(struct iwl_fw_runtime *fwrt, enum iwl_dsm_funcs func,
u32 *value)
{
struct uefi_cnv_var_general_cfg *data;
- int ret = EINVAL;
+ int ret = -EINVAL;
/* Not supported function index */
if (func >= DSM_FUNC_NUM_FUNCS || func == 5)
diff --git a/versions b/versions
index 3e1b91f125..582c05a620 100644
--- a/versions
+++ b/versions
@@ -2,4 +2,4 @@ BACKPORTS_VERSION="(see git)"
BACKPORTED_KERNEL_VERSION="(see git)"
BACKPORTED_KERNEL_NAME="iwlwifi"
BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__
-BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11889:a225ede6"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11890:26955ca2"