diff options
author | Greg Kroah-Hartman | 2019-04-21 23:18:44 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2019-04-21 23:18:44 +0200 |
commit | 817de6b85914a3dda72b971c074d4d342965fba0 (patch) | |
tree | df0a4563a04aadb8f8595f72392d66d65797c455 /drivers/pci/hotplug/pciehp_ctrl.c | |
parent | staging: kpc2000: add initial set of Daktronics drivers (diff) | |
parent | Linux 5.1-rc6 (diff) | |
download | kernel-qcow2-linux-817de6b85914a3dda72b971c074d4d342965fba0.tar.gz kernel-qcow2-linux-817de6b85914a3dda72b971c074d4d342965fba0.tar.xz kernel-qcow2-linux-817de6b85914a3dda72b971c074d4d342965fba0.zip |
Merge 5.1-rc6 into staging-next
We want the fixes in here as well as this resolves an iio driver merge
issue.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/pci/hotplug/pciehp_ctrl.c')
-rw-r--r-- | drivers/pci/hotplug/pciehp_ctrl.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c index 3f3df4c29f6e..905282a8ddaa 100644 --- a/drivers/pci/hotplug/pciehp_ctrl.c +++ b/drivers/pci/hotplug/pciehp_ctrl.c @@ -115,6 +115,10 @@ static void remove_board(struct controller *ctrl, bool safe_removal) * removed from the slot/adapter. */ msleep(1000); + + /* Ignore link or presence changes caused by power off */ + atomic_and(~(PCI_EXP_SLTSTA_DLLSC | PCI_EXP_SLTSTA_PDC), + &ctrl->pending_events); } /* turn off Green LED */ |