diff options
| author | Mark Brown <broonie@kernel.org> | 2016-05-02 13:02:09 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-05-02 13:02:09 +0200 |
| commit | 0ce8428ba9ea13098b828d0881e28368a108709c (patch) | |
| tree | 12cbe5d9c27319b8a18ac9fc9cb44e3c5f35408c /sound/soc/intel/skylake/skl-topology.h | |
| parent | ASoC: Intel: Atom: fix boot warning (diff) | |
| parent | Merge remote-tracking branches 'asoc/fix/rt5640' and 'asoc/fix/wm8962' into a... (diff) | |
| download | linux-0ce8428ba9ea13098b828d0881e28368a108709c.tar.xz linux-0ce8428ba9ea13098b828d0881e28368a108709c.zip | |
Merge tag 'asoc-fix-v4.6-rc5' into asoc-intel
ASoC: Fixes for v4.6
This is a fairly large collection of fixes but almost all driver
specific ones, especially to the new Intel drivers which have had a lot
of recent development. The one core fix is a change to the debugfs code
to avoid crashes in some relatively unusual configurations.
Diffstat (limited to 'sound/soc/intel/skylake/skl-topology.h')
| -rw-r--r-- | sound/soc/intel/skylake/skl-topology.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/intel/skylake/skl-topology.h b/sound/soc/intel/skylake/skl-topology.h index 22c913ddbab3..e4b399cd7868 100644 --- a/sound/soc/intel/skylake/skl-topology.h +++ b/sound/soc/intel/skylake/skl-topology.h @@ -274,10 +274,10 @@ struct skl_pipe { enum skl_module_state { SKL_MODULE_UNINIT = 0, - SKL_MODULE_INIT_DONE = 1, - SKL_MODULE_LOADED = 2, - SKL_MODULE_UNLOADED = 3, - SKL_MODULE_BIND_DONE = 4 + SKL_MODULE_LOADED = 1, + SKL_MODULE_INIT_DONE = 2, + SKL_MODULE_BIND_DONE = 3, + SKL_MODULE_UNLOADED = 4, }; struct skl_module_cfg { |