From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 9 Jan 2009 11:03:55 +0000 (+0000)
Subject: Merge branch 'for-2.6.29' into for-2.6.30
X-Git-Tag: v2.6.30-rc1~8^2~163
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5852973c129cf7c7e6c229abb7250673fc2a50c9;p=karo-tx-linux.git

Merge branch 'for-2.6.29' into for-2.6.30
---

5852973c129cf7c7e6c229abb7250673fc2a50c9
diff --cc sound/soc/soc-dapm.c
index a35ce69d9d78,493a4e8aa273..3a759c2872a8
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@@ -1073,15 -988,8 +1011,9 @@@ static int snd_soc_dapm_add_route(struc
  		if (ret != 0)
  			goto err;
  		break;
- 	case snd_soc_dapm_value_mux:
- 		ret = dapm_connect_value_mux(codec, wsource, wsink, path,
- 			control, &wsink->kcontrols[0]);
- 		if (ret != 0)
- 			goto err;
- 		break;
  	case snd_soc_dapm_switch:
  	case snd_soc_dapm_mixer:
 +	case snd_soc_dapm_mixer_named_ctl:
  		ret = dapm_connect_mixer(codec, wsource, wsink, path, control);
  		if (ret != 0)
  			goto err;