diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2014-11-19 10:43:26 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-19 11:56:46 +0100 |
| commit | 92a6e2a227da5fcaa5b31c9124eabf8c64a6d9f9 (patch) | |
| tree | b93d0e9d7d2f49682509ad257e3d9eecf10c5fca /sound/soc/intel | |
| parent | ASoC: Intel: add missing ACPI device table (diff) | |
| download | linux-92a6e2a227da5fcaa5b31c9124eabf8c64a6d9f9.tar.xz linux-92a6e2a227da5fcaa5b31c9124eabf8c64a6d9f9.zip | |
ASoC: Intel: cleanup runtime_pm initialization
For ACPI we missed to pm_runtime_enable() call which is required to tell PM
core that runtime on this device is enabled now. Since this is common to
both PCI and APCI move it out. Also for ACPI we do not require
pm_runtime_allow() call, so remove that
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel')
| -rw-r--r-- | sound/soc/intel/sst/sst.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/intel/sst/sst.c b/sound/soc/intel/sst/sst.c index b2b5604943b5..9e68a7cefd1b 100644 --- a/sound/soc/intel/sst/sst.c +++ b/sound/soc/intel/sst/sst.c @@ -378,13 +378,13 @@ void sst_configure_runtime_pm(struct intel_sst_drv *ctx) * initially active. So change the state to active before * enabling the pm */ - if (acpi_disabled) { + pm_runtime_enable(ctx->dev); + + if (acpi_disabled) pm_runtime_set_active(ctx->dev); - pm_runtime_enable(ctx->dev); - } else { - pm_runtime_allow(ctx->dev); + else pm_runtime_put_noidle(ctx->dev); - } + sst_save_shim64(ctx, ctx->shim, ctx->shim_regs64); } EXPORT_SYMBOL_GPL(sst_configure_runtime_pm); |