summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/tegra/tegra_max98095.c4
-rw-r--r--sound/soc/tegra/tegra_wm8903.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/tegra/tegra_max98095.c b/sound/soc/tegra/tegra_max98095.c
index 701571d23251..d065b78164ac 100644
--- a/sound/soc/tegra/tegra_max98095.c
+++ b/sound/soc/tegra/tegra_max98095.c
@@ -581,6 +581,7 @@ static struct snd_soc_dai_link tegra_max98095_dai[] = {
};
static int tegra30_soc_set_bias_level(struct snd_soc_card *card,
+ struct snd_soc_dapm_context *dapm,
enum snd_soc_bias_level level)
{
struct tegra_max98095 *machine = snd_soc_card_get_drvdata(card);
@@ -595,6 +596,7 @@ static int tegra30_soc_set_bias_level(struct snd_soc_card *card,
}
static int tegra30_soc_set_bias_level_post(struct snd_soc_card *card,
+ struct snd_soc_dapm_context *dapm,
enum snd_soc_bias_level level)
{
struct tegra_max98095 *machine = snd_soc_card_get_drvdata(card);
@@ -672,8 +674,8 @@ err_unregister_card:
err_switch_unregister:
#ifdef CONFIG_SWITCH
switch_dev_unregister(&wired_switch_dev);
-#endif
err_fini_utils:
+#endif
tegra_asoc_utils_fini(&machine->util_data);
err_free_machine:
kfree(machine);
diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c
index 147546575233..063aefe50507 100644
--- a/sound/soc/tegra/tegra_wm8903.c
+++ b/sound/soc/tegra/tegra_wm8903.c
@@ -902,8 +902,8 @@ err_unregister_card:
err_unregister_switch:
#ifdef CONFIG_SWITCH
switch_dev_unregister(&tegra_wm8903_headset_switch);
-#endif
err_fini_utils:
+#endif
tegra_asoc_utils_fini(&machine->util_data);
err_free_machine:
kfree(machine);