Merge branch 'fix/asoc' into for-linus

Takashi Iwai committed 15 years ago

Commit 3190dad2 parents 157186b ea02c632 files · +8 −5Browse files

Unified · Split

2 files

sound/soc/codecs/wm_hubs.c +4 −4
sound/soc/soc-dapm.c +4 −1

@@ -215,23 +215,23 @@ static const struct snd_kcontrol_new analogue_snd_controls[] = { · 214 unmodified lines
215	215	SOC_SINGLE_TLV("IN1L Volume", WM8993_LEFT_LINE_INPUT_1_2_VOLUME, 0, 31, 0,
216	216	inpga_tlv),
217	217	SOC_SINGLE("IN1L Switch", WM8993_LEFT_LINE_INPUT_1_2_VOLUME, 7, 1, 1),
218		−SOC_SINGLE("IN1L ZC Switch", WM8993_LEFT_LINE_INPUT_1_2_VOLUME, 7, 1, 0),
	218	+SOC_SINGLE("IN1L ZC Switch", WM8993_LEFT_LINE_INPUT_1_2_VOLUME, 6, 1, 0),
219	219
220	220	SOC_SINGLE_TLV("IN1R Volume", WM8993_RIGHT_LINE_INPUT_1_2_VOLUME, 0, 31, 0,
221	221	inpga_tlv),
222	222	SOC_SINGLE("IN1R Switch", WM8993_RIGHT_LINE_INPUT_1_2_VOLUME, 7, 1, 1),
223		−SOC_SINGLE("IN1R ZC Switch", WM8993_RIGHT_LINE_INPUT_1_2_VOLUME, 7, 1, 0),
	223	+SOC_SINGLE("IN1R ZC Switch", WM8993_RIGHT_LINE_INPUT_1_2_VOLUME, 6, 1, 0),
224	224
225	225
226	226	SOC_SINGLE_TLV("IN2L Volume", WM8993_LEFT_LINE_INPUT_3_4_VOLUME, 0, 31, 0,
227	227	inpga_tlv),
228	228	SOC_SINGLE("IN2L Switch", WM8993_LEFT_LINE_INPUT_3_4_VOLUME, 7, 1, 1),
229		−SOC_SINGLE("IN2L ZC Switch", WM8993_LEFT_LINE_INPUT_3_4_VOLUME, 7, 1, 0),
	229	+SOC_SINGLE("IN2L ZC Switch", WM8993_LEFT_LINE_INPUT_3_4_VOLUME, 6, 1, 0),
230	230
231	231	SOC_SINGLE_TLV("IN2R Volume", WM8993_RIGHT_LINE_INPUT_3_4_VOLUME, 0, 31, 0,
232	232	inpga_tlv),
233	233	SOC_SINGLE("IN2R Switch", WM8993_RIGHT_LINE_INPUT_3_4_VOLUME, 7, 1, 1),
234		−SOC_SINGLE("IN2R ZC Switch", WM8993_RIGHT_LINE_INPUT_3_4_VOLUME, 7, 1, 0),
	234	+SOC_SINGLE("IN2R ZC Switch", WM8993_RIGHT_LINE_INPUT_3_4_VOLUME, 6, 1, 0),
235	235
236	236	SOC_SINGLE_TLV("MIXINL IN2L Volume", WM8993_INPUT_MIXER3, 7, 1, 0,
237	237	inmix_sw_tlv),

sound/soc/soc-dapm.c+4−1

@@ -325,6 +325,7 @@ static int dapm_connect_mixer(struct snd_soc_dapm_context *dapm, · 324 unmodified lines
325	325	}
326	326
327	327	static int dapm_is_shared_kcontrol(struct snd_soc_dapm_context *dapm,
	328	+ struct snd_soc_dapm_widget *kcontrolw,
328	329	const struct snd_kcontrol_new *kcontrol_new,
329	330	struct snd_kcontrol **kcontrol)
330	331	{
@@ -334,6 +335,8 @@ static int dapm_is_shared_kcontrol(struct snd_soc_dapm_context *dapm, · 3 unmodified lines
334	335	*kcontrol = NULL;
335	336
336	337	list_for_each_entry(w, &dapm->card->widgets, list) {
	338	+ if (w == kcontrolw \|\| w->dapm != kcontrolw->dapm)
	339	+ continue;
337	340	for (i = 0; i < w->num_kcontrols; i++) {
338	341	if (&w->kcontrol_news[i] == kcontrol_new) {
339	342	if (w->kcontrols)
@@ -468,7 +471,7 @@ static int dapm_new_mux(struct snd_soc_dapm_context *dapm, · 128 unmodified lines
468	471	return -EINVAL;
469	472	}
470	473
471		− shared = dapm_is_shared_kcontrol(dapm, &w->kcontrol_news[0],
	474	+ shared = dapm_is_shared_kcontrol(dapm, w, &w->kcontrol_news[0],
472	475	&kcontrol);
473	476	if (kcontrol) {
474	477	wlist = kcontrol->private_data;

Merge branch 'fix/asoc' into for-linus

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code