wifi: iwlwifi: fix merge damage related to iwl_pci_resume
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Tue, 3 Jun 2025 09:17:54 +0000 (12:17 +0300)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 11 Jun 2025 09:27:21 +0000 (11:27 +0200)
commit6a0f81c549a00f87865ff0ad2400944ca0726868
tree59e137c3d60b1dba40753296a703480bb292a7f3
parent570896604f47d44d4ff6882d2a588428d2a6ef17
wifi: iwlwifi: fix merge damage related to iwl_pci_resume

The changes I made in
wifi: iwlwifi: don't warn if the NIC is gone in resume
conflicted with a major rework done in this area.
The merge de-facto removed my changes.
Re-add them.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Link: https://patch.msgid.link/20250603091754.70182-1-emmanuel.grumbach@intel.com
Fixes: 06c4b2036818 ("Merge tag 'iwlwifi-next-2025-05-15' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/intel/iwlwifi/pcie/drv.c