Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 268519
b: refs/heads/master
c: 5bf8ebc
h: refs/heads/master
i:
  268517: 472c171
  268515: 2e71ed1
  268511: d176fb0
v: v3
  • Loading branch information
Jaap Crezee authored and Greg Kroah-Hartman committed Sep 27, 2011
1 parent a87b86a commit 1b3e4e0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: abc51b6de532b1071d8335918970c5d9154da73f
refs/heads/master: 5bf8ebc5c67b808ca0d2e90d898df46405caa8f0
10 changes: 6 additions & 4 deletions trunk/drivers/staging/intel_sst/intel_sst.c
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ static int __devinit intel_sst_probe(struct pci_dev *pci,
if (ret) {
pr_err("couldn't register LPE device\n");
goto do_free_misc;
}
}
} else if (sst_drv_ctx->pci_id == SST_MFLD_PCI_ID) {
u32 csr;

Expand Down Expand Up @@ -524,9 +524,11 @@ int intel_sst_resume(struct pci_dev *pci)
return 0;
}

/* The runtime_suspend/resume is pretty much similar to the legacy suspend/resume with the noted exception below:
* The PCI core takes care of taking the system through D3hot and restoring it back to D0 and so there is
* no need to duplicate that here.
/* The runtime_suspend/resume is pretty much similar to the legacy
* suspend/resume with the noted exception below:
* The PCI core takes care of taking the system through D3hot and
* restoring it back to D0 and so there is no need to duplicate
* that here.
*/
static int intel_sst_runtime_suspend(struct device *dev)
{
Expand Down

0 comments on commit 1b3e4e0

Please sign in to comment.