samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI: check saved state before restore
This commit is contained in:
Linus Torvalds
2009-08-22 12:14:01 -07:00
parent e3054ea7f7 c82f63e411
commit 3edf2fb9d8
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pci/pci-driver.c
View File

@@ -508,7 +508,7 @@ static int pci_restore_standard_config(struct pci_dev *pci_dev)
return error; 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) static void pci_pm_default_resume_noirq(struct pci_dev *pci_dev)

2
drivers/pci/pci.c
View File

@@ -846,6 +846,8 @@ pci_restore_state(struct pci_dev *dev)
int i; int i;
u32 val; u32 val;
if (!dev->state_saved)
return 0;
/* PCI Express register must be restored first */ /* PCI Express register must be restored first */
pci_restore_pcie_state(dev); pci_restore_pcie_state(dev);