Merge branch 'pci/misc' into next (5485e49f) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/pci/pci-driver.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -466,7 +466,6 @@ static void pci_device_shutdown(struct device *dev)
		pci_msi_shutdown(pci_dev);
		pci_msix_shutdown(pci_dev);

		#ifdef CONFIG_KEXEC_CORE
		/*
		* If this is a kexec reboot, turn off Bus Master bit on the
		* device to tell it to not continue to do DMA. Don't touch
		@@ -476,7 +475,6 @@ static void pci_device_shutdown(struct device *dev)
		*/
		if (kexec_in_progress && (pci_dev->current_state <= PCI_D3hot))
		pci_clear_master(pci_dev);
		#endif
		}

		#ifdef CONFIG_PM