diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2019-09-27 21:36:58 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-10-09 23:03:23 +0200 |
| commit | ed333684709658e6a5a0dd6f321eb0c9dccd826f (patch) | |
| tree | dafeb8e32982327ddd7eb3fe016683a7806670ad /patches/0085-iwlwifi-pci-device-removal.patch | |
| parent | 4ec72687181df4b786152747c008a688c9b9b9de (diff) | |
backports: patches: Refresh against kernel 5.4-rc2
Manual modifications where needed to make the following patch apply:
patches/0013-fix-makefile-includes/rtw88.patch
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/0085-iwlwifi-pci-device-removal.patch')
| -rw-r--r-- | patches/0085-iwlwifi-pci-device-removal.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/0085-iwlwifi-pci-device-removal.patch b/patches/0085-iwlwifi-pci-device-removal.patch index 43f4e4b3..f858fe99 100644 --- a/patches/0085-iwlwifi-pci-device-removal.patch +++ b/patches/0085-iwlwifi-pci-device-removal.patch @@ -2,7 +2,7 @@ diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wirel index f74281508197..3b11bd68f261 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c -@@ -1955,6 +1955,9 @@ static void iwl_trans_pcie_removal_wk(st +@@ -1998,6 +1998,9 @@ static void iwl_trans_pcie_removal_wk(st struct iwl_trans_pcie_removal *removal = container_of(wk, struct iwl_trans_pcie_removal, work); struct pci_dev *pdev = removal->pdev; @@ -12,7 +12,7 @@ index f74281508197..3b11bd68f261 100644 static char *prop[] = {"EVENT=INACCESSIBLE", NULL}; dev_err(&pdev->dev, "Device gone - attempting removal\n"); -@@ -1963,6 +1966,7 @@ static void iwl_trans_pcie_removal_wk(st +@@ -2006,6 +2009,7 @@ static void iwl_trans_pcie_removal_wk(st pci_dev_put(pdev); pci_stop_and_remove_bus_device(pdev); pci_unlock_rescan_remove(); |