diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-11-30 22:25:54 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-12-06 22:54:26 +0100 |
| commit | 9035c08635eaaf6d381fac54febf5816dcc4fae6 (patch) | |
| tree | 9da04f20e16fb1c0f0cbf5198a4fff41e4d65af8 /patches/0085-iwlwifi-pci-device-removal.patch | |
| parent | b198137b5b0011ed7ea8b58f2b6a3e391ceec662 (diff) | |
backports: Refresh patches on kernel 4.20-rc4
This patch was merged upstream and removed from backports:
* patches/0090-use-skb_pad.patch
This patch was manually modified:
* patches/0025-usb-sg/usbnet.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 6e1f1fff..f61f0172 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 cc8c53dc0ab6..68296b65a680 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c -@@ -1922,6 +1922,9 @@ static void iwl_trans_pcie_removal_wk(struct work_struct *wk) +@@ -1941,6 +1941,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 cc8c53dc0ab6..68296b65a680 100644 char *prop[] = {"EVENT=INACCESSIBLE", NULL}; dev_err(&pdev->dev, "Device gone - attempting removal\n"); -@@ -1930,6 +1933,7 @@ static void iwl_trans_pcie_removal_wk(struct work_struct *wk) +@@ -1949,6 +1952,7 @@ static void iwl_trans_pcie_removal_wk(st pci_dev_put(pdev); pci_stop_and_remove_bus_device(pdev); pci_unlock_rescan_remove(); |