Commit 59a2b16d authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/controller/hv' 

- To avoid a NULL pointer dereference, skip MSI restore after hibernate if
  MSI/MSI-X hasn't been enabled (Dexuan Cui)

* pci/controller/hv:
  PCI: hv: Fix a crash in hv_pci_restore_msi_msg() during hibernation
parents 9190819c 04bbe863

drivers/pci/controller/pci-hyperv.c

+3 −0
Original line number Diff line number Diff line
@@ -3983,6 +3983,9 @@ static int hv_pci_restore_msi_msg(struct pci_dev *pdev, void *arg) 
	struct msi_desc *entry;

	int ret = 0;



	if (!pdev->msi_enabled && !pdev->msix_enabled)

		return 0;



	msi_lock_descs(&pdev->dev);

	msi_for_each_desc(entry, &pdev->dev, MSI_DESC_ASSOCIATED) {

		irq_data = irq_get_irq_data(entry->irq);