diff mbox series

[2/6] backports: update iwlwifi pci device removal patch for v5.0

Message ID 20190315143318.4714-3-luca@coelho.fi (mailing list archive)
State Accepted
Headers show
Series backport: some patches from our internal tree 2019-03-15 | expand

Commit Message

Luca Coelho March 15, 2019, 2:33 p.m. UTC 
From: Luca Coelho <luciano.coelho@intel.com>

The code surrounding the #ifdef we add has changed.  Update the patch
accordingly.

Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
 patches/0085-iwlwifi-pci-device-removal.patch | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/patches/0085-iwlwifi-pci-device-removal.patch b/patches/0085-iwlwifi-pci-device-removal.patch
index 84fa7f9264a8..97a904f6365f 100644
--- a/patches/0085-iwlwifi-pci-device-removal.patch
+++ b/patches/0085-iwlwifi-pci-device-removal.patch
@@ -1,18 +1,18 @@ 
 diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
-index cc8c53dc0ab6..68296b65a680 100644
+index f74281508197..3b11bd68f261 100644
 --- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
 +++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
-@@ -1968,6 +1968,9 @@ static void iwl_trans_pcie_removal_wk(st
+@@ -1964,6 +1964,9 @@ static void iwl_trans_pcie_removal_wk(struct work_struct *wk)
  	struct iwl_trans_pcie_removal *removal =
  		container_of(wk, struct iwl_trans_pcie_removal, work);
  	struct pci_dev *pdev = removal->pdev;
 +#if LINUX_VERSION_IS_LESS(3,14,0)
 +	dev_err(&pdev->dev, "Device gone - can't remove on old kernels.\n");
 +#else
- 	char *prop[] = {"EVENT=INACCESSIBLE", NULL};
+ 	static char *prop[] = {"EVENT=INACCESSIBLE", NULL};
  
  	dev_err(&pdev->dev, "Device gone - attempting removal\n");
-@@ -1976,6 +1979,7 @@ static void iwl_trans_pcie_removal_wk(st
+@@ -1972,6 +1975,7 @@ static void iwl_trans_pcie_removal_wk(struct work_struct *wk)
  	pci_dev_put(pdev);
  	pci_stop_and_remove_bus_device(pdev);
  	pci_unlock_rescan_remove();