Commit 82cd8764 authored Aug 15, 2011 by Lars-Peter Clausen Committed by Mark Brown Aug 16, 2011

ASoC: DAPM: Allow multiple mixer sources to be routed via the same switch

Currently it is only possible to route one source per switch into a mixer.
This patch modifies the code, so that it is possible to route multiple sources
into a mixer via the same switch. One use-case for this is routing a stereo
channel pair into a mono-mixer via the same switch.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

parent d09f3ecf

sound/soc/soc-dapm.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -443,6 +443,11 @@ static int dapm_new_mixer(struct snd_soc_dapm_widget *w)
		if (path->name != (char *)w->kcontrol_news[i].name)
		continue;

		if (w->kcontrols[i]) {
		path->kcontrol = w->kcontrols[i];
		continue;
		}

		wlistsize = sizeof(struct snd_soc_dapm_widget_list) +
		sizeof(struct snd_soc_dapm_widget *),
		wlist = kzalloc(wlistsize, GFP_KERNEL);
		@@ -1556,7 +1561,6 @@ static int dapm_mixer_update_power(struct snd_soc_dapm_widget *widget,
		/* found, now check type */
		found = 1;
		path->connect = connect;
		break;
		}

		if (found)