Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41caa416 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus

parents ca89bc24 298402a3

sound/soc/soc-dapm.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -1974,7 +1974,7 @@ static ssize_t dapm_widget_power_read_file(struct file *file, 
				w->active ? "active" : "inactive");

				w->active ? "active" : "inactive");





	list_for_each_entry(p, &w->sources, list_sink) {

	list_for_each_entry(p, &w->sources, list_sink) {

		if (p->connected && !p->connected(w, p->sink))

		if (p->connected && !p->connected(w, p->source))

			continue;

			continue;





		if (p->connect)

		if (p->connect)
@@ -3525,6 +3525,7 @@ int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm, 
		if (!w) {

		if (!w) {

			dev_err(dapm->dev, "ASoC: Failed to create %s widget\n",

			dev_err(dapm->dev, "ASoC: Failed to create %s widget\n",

				dai->driver->playback.stream_name);

				dai->driver->playback.stream_name);

			return -ENOMEM;

		}

		}





		w->priv = dai;

		w->priv = dai;
@@ -3543,6 +3544,7 @@ int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm, 
		if (!w) {

		if (!w) {

			dev_err(dapm->dev, "ASoC: Failed to create %s widget\n",

			dev_err(dapm->dev, "ASoC: Failed to create %s widget\n",

				dai->driver->capture.stream_name);

				dai->driver->capture.stream_name);

			return -ENOMEM;

		}

		}





		w->priv = dai;

		w->priv = dai;