diff --git a/patches.suse/iwlwifi-pcie-fix-locking-when-HW-not-ready.patch b/patches.suse/iwlwifi-pcie-fix-locking-when-HW-not-ready.patch new file mode 100644 index 0000000..51f3ef5 --- /dev/null +++ b/patches.suse/iwlwifi-pcie-fix-locking-when-HW-not-ready.patch @@ -0,0 +1,38 @@ +From e9848aed147708a06193b40d78493b0ef6abccf2 Mon Sep 17 00:00:00 2001 +From: Johannes Berg +Date: Fri, 28 Jan 2022 14:30:52 +0200 +Subject: [PATCH] iwlwifi: pcie: fix locking when "HW not ready" +Git-commit: e9848aed147708a06193b40d78493b0ef6abccf2 +References: git-fixes +Patch-mainline: v5.17-rc5 + +If we run into this error path, we shouldn't unlock the mutex +since it's not locked since. Fix this. + +Fixes: a6bd005fe92d ("iwlwifi: pcie: fix RF-Kill vs. firmware load race") +Signed-off-by: Johannes Berg +Signed-off-by: Luca Coelho +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/iwlwifi.20220128142706.5d16821d1433.Id259699ddf9806459856d6aefbdbe54477aecffd@changeid +Signed-off-by: Oliver Neukum +--- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c +index a63386a01232..ef14584fc0a1 100644 +--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c ++++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c +@@ -1329,8 +1329,7 @@ static int iwl_trans_pcie_start_fw(struct iwl_trans *trans, + /* This may fail if AMT took ownership of the device */ + if (iwl_pcie_prepare_card_hw(trans)) { + IWL_WARN(trans, "Exit HW not ready\n"); +- ret = -EIO; +- goto out; ++ return -EIO; + } + + iwl_enable_rfkill_int(trans); +-- +2.40.0 + diff --git a/series.conf b/series.conf index a7481e9..a47f753 100644 --- a/series.conf +++ b/series.conf @@ -62185,6 +62185,7 @@ patches.suse/cifs-mark-sessions-for-reconnection-in-helper-function.patch patches.suse/msft-hv-2522-PCI-hv-Fix-NUMA-node-assignment-when-kernel-boots-wi.patch patches.suse/mmc-block-fix-read-single-on-recovery-logic.patch + patches.suse/iwlwifi-pcie-fix-locking-when-HW-not-ready.patch patches.suse/net_sched-add-__rcu-annotation-to-netdev-qdisc.patch patches.suse/USB-zaurus-support-another-broken-Zaurus.patch patches.suse/net-usb-cdc_mbim-avoid-altsetting-toggling-for-Teli2.patch