aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/sound/soc-dapm.h2
-rw-r--r--include/sound/soc.h2
-rw-r--r--sound/soc/soc-dapm.c5
3 files changed, 5 insertions, 4 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 6a25e6993859..979ed84e07d6 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -501,7 +501,7 @@ struct snd_soc_dapm_context {
501 struct snd_soc_dapm_update *update; 501 struct snd_soc_dapm_update *update;
502 502
503 void (*seq_notifier)(struct snd_soc_dapm_context *, 503 void (*seq_notifier)(struct snd_soc_dapm_context *,
504 enum snd_soc_dapm_type); 504 enum snd_soc_dapm_type, int);
505 505
506 struct device *dev; /* from parent - for debug */ 506 struct device *dev; /* from parent - for debug */
507 struct snd_soc_codec *codec; /* parent codec */ 507 struct snd_soc_codec *codec; /* parent codec */
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 64856d656f15..7ecdaefd1b63 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -553,7 +553,7 @@ struct snd_soc_codec_driver {
553 enum snd_soc_bias_level level); 553 enum snd_soc_bias_level level);
554 554
555 void (*seq_notifier)(struct snd_soc_dapm_context *, 555 void (*seq_notifier)(struct snd_soc_dapm_context *,
556 enum snd_soc_dapm_type); 556 enum snd_soc_dapm_type, int);
557}; 557};
558 558
559/* SoC platform interface */ 559/* SoC platform interface */
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 37b376f4c75d..0f94fd057f29 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -899,7 +899,8 @@ static void dapm_seq_run(struct snd_soc_dapm_context *dapm,
899 for (i = 0; i < ARRAY_SIZE(dapm_up_seq); i++) 899 for (i = 0; i < ARRAY_SIZE(dapm_up_seq); i++)
900 if (sort[i] == cur_sort) 900 if (sort[i] == cur_sort)
901 cur_dapm->seq_notifier(cur_dapm, 901 cur_dapm->seq_notifier(cur_dapm,
902 i); 902 i,
903 cur_subseq);
903 } 904 }
904 905
905 INIT_LIST_HEAD(&pending); 906 INIT_LIST_HEAD(&pending);
@@ -968,7 +969,7 @@ static void dapm_seq_run(struct snd_soc_dapm_context *dapm,
968 for (i = 0; i < ARRAY_SIZE(dapm_up_seq); i++) 969 for (i = 0; i < ARRAY_SIZE(dapm_up_seq); i++)
969 if (sort[i] == cur_sort) 970 if (sort[i] == cur_sort)
970 cur_dapm->seq_notifier(cur_dapm, 971 cur_dapm->seq_notifier(cur_dapm,
971 i); 972 i, cur_subseq);
972 } 973 }
973} 974}
974 975