Merge tag 'arm-soc-defconfig-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / sound / soc / soc-dapm.c

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 7f87b44..9f0c86c 100644 (file)
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -3955,13 +3955,13 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
                substream->stream = SNDRV_PCM_STREAM_CAPTURE;
                snd_soc_dapm_widget_for_each_source_path(w, path) {
                        source = path->source->priv;
-                       snd_soc_dai_hw_free(source, substream);
+                       snd_soc_dai_hw_free(source, substream, 0);
                }
 
                substream->stream = SNDRV_PCM_STREAM_PLAYBACK;
                snd_soc_dapm_widget_for_each_sink_path(w, path) {
                        sink = path->sink->priv;
-                       snd_soc_dai_hw_free(sink, substream);
+                       snd_soc_dai_hw_free(sink, substream, 0);
                }
 
                substream->stream = SNDRV_PCM_STREAM_CAPTURE;
@@ -4764,7 +4764,7 @@ void snd_soc_dapm_init(struct snd_soc_dapm_context *dapm,
 
        if (component) {
                dapm->dev               = component->dev;
-               dapm->idle_bias_off     = !component->driver->idle_bias_on,
+               dapm->idle_bias_off     = !component->driver->idle_bias_on;
                dapm->suspend_bias_off  = component->driver->suspend_bias_off;
        } else {
                dapm->dev               = card->dev;