Merge remote-tracking branches 'asoc/topic/link-param', 'asoc/topic/max98090', 'asoc...

[linux-drm-fsl-dcu.git] / sound / soc / soc-core.c

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 2fb3bf738b5b2314d7742e526b734f73f0a831ca..12b7ff2426da8867177369a4fd603e322b48baca 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1298,7 +1298,8 @@ static int soc_link_dai_widgets(struct snd_soc_card *card,
        capture_w = cpu_dai->capture_widget;
        if (play_w && capture_w) {
                ret = snd_soc_dapm_new_pcm(card, dai_link->params,
-                                          capture_w, play_w);
+                                          dai_link->num_params, capture_w,
+                                          play_w);
                if (ret != 0) {
                        dev_err(card->dev, "ASoC: Can't link %s to %s: %d\n",
                                play_w->name, capture_w->name, ret);
@@ -1310,7 +1311,8 @@ static int soc_link_dai_widgets(struct snd_soc_card *card,
        capture_w = codec_dai->capture_widget;
        if (play_w && capture_w) {
                ret = snd_soc_dapm_new_pcm(card, dai_link->params,
-                                          capture_w, play_w);
+                                          dai_link->num_params, capture_w,
+                                          play_w);
                if (ret != 0) {
                        dev_err(card->dev, "ASoC: Can't link %s to %s: %d\n",
                                play_w->name, capture_w->name, ret);