From 1b3e4e01da0cef98db43e679a87ee3bc4ba3468e Mon Sep 17 00:00:00 2001 From: Jaap Crezee Date: Wed, 21 Sep 2011 22:48:44 +0200 Subject: [PATCH] --- yaml --- r: 268519 b: refs/heads/master c: 5bf8ebc5c67b808ca0d2e90d898df46405caa8f0 h: refs/heads/master i: 268517: 472c17116d43415a233e587c4532a7150302874e 268515: 2e71ed15cb26cf857f84ba57efcf1e6a0fc5ac32 268511: d176fb0f0c4029ceac3b281d426e34adf7a5bf49 v: v3 --- [refs] | 2 +- trunk/drivers/staging/intel_sst/intel_sst.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c5f39bff4aa8..f9848d42de24 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: abc51b6de532b1071d8335918970c5d9154da73f +refs/heads/master: 5bf8ebc5c67b808ca0d2e90d898df46405caa8f0 diff --git a/trunk/drivers/staging/intel_sst/intel_sst.c b/trunk/drivers/staging/intel_sst/intel_sst.c index d892861346fc..c303d85011b0 100644 --- a/trunk/drivers/staging/intel_sst/intel_sst.c +++ b/trunk/drivers/staging/intel_sst/intel_sst.c @@ -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; @@ -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) {