3.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman gregkh@linuxfoundation.org
This reverts commit 058645e2f0647c85f2bfd577771546d198739fd2 which was commit fda78d7a0ead144f4b2cdb582dcba47911f4952c upstream.
The dependancy tree is just too messy here, just drop it from this kernel as it's not really needed here.
Reported-by: Ben Hutchings ben.hutchings@codethink.co.uk Cc: Prarit Bhargava prarit@redhat.com Cc: Bjorn Helgaas bhelgaas@google.com Cc: Alex Williamson alex.williamson@redhat.com Cc: David Arcari darcari@redhat.com Cc: Myron Stowe mstowe@redhat.com Cc: Lukas Wunner lukas@wunner.de Cc: Keith Busch keith.busch@intel.com Cc: Mika Westerberg mika.westerberg@linux.intel.com Cc: Sasha Levin alexander.levin@microsoft.com Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- drivers/pci/pci-driver.c | 2 ++ 1 file changed, 2 insertions(+)
--- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -450,6 +450,8 @@ static void pci_device_shutdown(struct d
if (drv && drv->shutdown) drv->shutdown(pci_dev); + pci_msi_shutdown(pci_dev); + pci_msix_shutdown(pci_dev);
#ifdef CONFIG_KEXEC /*