From: Liam Girdwood <lrg@slimlogic.co.uk>
Date: Mon, 23 Aug 2010 11:58:01 +0000 (+0100)
Subject: Merge remote branch 'broonie-asoc/for-2.6.37' into for-2.6.37
X-Git-Tag: v2.6.37-rc1~126^2~1^2~128^2~5
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=97e15b1fcf79a60cb146d4123e7c72ac2736e258;p=~shefty%2Frdma-dev.git

Merge remote branch 'broonie-asoc/for-2.6.37' into for-2.6.37
---

97e15b1fcf79a60cb146d4123e7c72ac2736e258
diff --cc sound/soc/codecs/tlv320aic3x.c
index 0b80e242a66,c07465720cd..efae8b53fd6
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@@ -1241,8 -1289,12 +1291,10 @@@ static int aic3x_probe(struct snd_soc_c
  			    (aic3x->setup->gpio_func[1] & 0xf) << 4);
  	}
  
 -	aic3x_init(codec);
 -
  	snd_soc_add_controls(codec, aic3x_snd_controls,
  			     ARRAY_SIZE(aic3x_snd_controls));
+ 	if (aic3x->model == AIC3X_MODEL_3007)
+ 		snd_soc_add_controls(codec, &aic3x_classd_amp_gain_ctrl, 1);
  
  	aic3x_add_widgets(codec);