Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3edf2fb9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI: check saved state before restore
parents e3054ea7 c82f63e4

drivers/pci/pci-driver.c

+1 −1
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ static int pci_restore_standard_config(struct pci_dev *pci_dev) 
			return error;

	}



	return pci_dev->state_saved ? pci_restore_state(pci_dev) : 0;

	return pci_restore_state(pci_dev);

}



static void pci_pm_default_resume_noirq(struct pci_dev *pci_dev)

drivers/pci/pci.c

+2 −0
Original line number Diff line number Diff line
@@ -846,6 +846,8 @@ pci_restore_state(struct pci_dev *dev) 
	int i;

	u32 val;



	if (!dev->state_saved)

		return 0;

	/* PCI Express register must be restored first */

	pci_restore_pcie_state(dev);