From 021dec732beb4d6da37484ff9968a8570950cafb Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Mon, 17 Aug 2009 16:26:59 +0100 Subject: [PATCH] --- yaml --- r: 157671 b: refs/heads/master c: 1ca04065c3569beb42b9376952df8c96f430f753 h: refs/heads/master i: 157669: f36c70151a6d71d5e6dec345820e36e87ede53cd 157667: c9d92b67f428a2936b0c4bded8495b66f41c7b04 157663: 5fc1d4690e7707665158285bd175da7df6859bc4 v: v3 --- [refs] | 2 +- trunk/sound/soc/soc-dapm.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4622b9ee6494..9a51ce2536f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b14b76a56e49946488637ee68926c5180c39fdb1 +refs/heads/master: 1ca04065c3569beb42b9376952df8c96f430f753 diff --git a/trunk/sound/soc/soc-dapm.c b/trunk/sound/soc/soc-dapm.c index 8997fb34dddd..88461310dc96 100644 --- a/trunk/sound/soc/soc-dapm.c +++ b/trunk/sound/soc/soc-dapm.c @@ -64,15 +64,15 @@ static int dapm_up_seq[] = { [snd_soc_dapm_pga] = 7, [snd_soc_dapm_adc] = 8, [snd_soc_dapm_hp] = 9, - [snd_soc_dapm_spk] = 10, - [snd_soc_dapm_post] = 11, + [snd_soc_dapm_spk] = 9, + [snd_soc_dapm_post] = 10, }; static int dapm_down_seq[] = { [snd_soc_dapm_pre] = 0, [snd_soc_dapm_adc] = 1, [snd_soc_dapm_hp] = 2, - [snd_soc_dapm_spk] = 3, + [snd_soc_dapm_spk] = 2, [snd_soc_dapm_pga] = 4, [snd_soc_dapm_mixer_named_ctl] = 5, [snd_soc_dapm_mixer] = 5,