Merge remote-tracking branch 'sound-asoc/for-next'

[deliverable/linux.git] / sound / soc / intel / skylake / skl-topology.h

diff --git a/sound/soc/intel/skylake/skl-topology.h b/sound/soc/intel/skylake/skl-topology.h
index 22d3ef83817dfdfa762c65d08bba11b4628dc74f..37f45cc32a44a273e2e3610c3012a33f1a8275a7 100644 (file)
--- a/sound/soc/intel/skylake/skl-topology.h
+++ b/sound/soc/intel/skylake/skl-topology.h
@@ -133,7 +133,7 @@ struct skl_i2s_config_blob {
 struct skl_dma_control {
        u32 node_id;
        u32 config_length;
-       u32 config_data[1];
+       u32 config_data[0];
 } __packed;
 
 struct skl_cpr_cfg {
@@ -216,7 +216,7 @@ struct skl_module_fmt {
 struct skl_module_cfg;
 
 struct skl_module_inst_id {
-       u32 module_id;
+       int module_id;
        u32 instance_id;
 };