diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2019-03-20 12:47:49 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-03-28 00:08:17 +0100 |
commit | 2fee410fa7e3c618f8231a180971f7ae112cf8f9 (patch) | |
tree | 8ea8ccafe2abdb93dc6c72efb5d65577c87991ba /patches/0085-iwlwifi-pci-device-removal.patch | |
parent | 55b5f78515d97cee0fa2d75d23d3cc5662e80895 (diff) |
backports: Refresh patches on top of 5.1-rc2
No manual changes needed.
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 97a904f6..b7536d93 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 -@@ -1964,6 +1964,9 @@ static void iwl_trans_pcie_removal_wk(struct work_struct *wk) +@@ -1926,6 +1926,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"); -@@ -1972,6 +1975,7 @@ static void iwl_trans_pcie_removal_wk(struct work_struct *wk) +@@ -1934,6 +1937,7 @@ static void iwl_trans_pcie_removal_wk(st pci_dev_put(pdev); pci_stop_and_remove_bus_device(pdev); pci_unlock_rescan_remove(); |