aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@nokia.com>2009-04-07 02:14:00 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-04-07 05:52:00 -0400
commitd6648da122870ff42bc720da25483bdb8bc868f8 (patch)
treef9c079cd770dc46795f3af6c3610b65fa8de771e /sound
parent5c15a6869a75000fecea61e9985f4753311ec534 (diff)
ASoC: TWL4030: Compillation error fix
Fix for compillation error introduced by the constrain patch. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/twl4030.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index bfda7a88e82..921b205de28 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -1220,11 +1220,12 @@ static int twl4030_set_bias_level(struct snd_soc_codec *codec,
1220 return 0; 1220 return 0;
1221} 1221}
1222 1222
1223static int twl4030_startup(struct snd_pcm_substream *substream) 1223static int twl4030_startup(struct snd_pcm_substream *substream,
1224 struct snd_soc_dai *dai)
1224{ 1225{
1225 struct snd_soc_pcm_runtime *rtd = substream->private_data; 1226 struct snd_soc_pcm_runtime *rtd = substream->private_data;
1226 struct snd_soc_device *socdev = rtd->socdev; 1227 struct snd_soc_device *socdev = rtd->socdev;
1227 struct snd_soc_codec *codec = socdev->codec; 1228 struct snd_soc_codec *codec = socdev->card->codec;
1228 struct twl4030_priv *twl4030 = codec->private_data; 1229 struct twl4030_priv *twl4030 = codec->private_data;
1229 1230
1230 /* If we already have a playback or capture going then constrain 1231 /* If we already have a playback or capture going then constrain
@@ -1251,11 +1252,12 @@ static int twl4030_startup(struct snd_pcm_substream *substream)
1251 return 0; 1252 return 0;
1252} 1253}
1253 1254
1254static void twl4030_shutdown(struct snd_pcm_substream *substream) 1255static void twl4030_shutdown(struct snd_pcm_substream *substream,
1256 struct snd_soc_dai *dai)
1255{ 1257{
1256 struct snd_soc_pcm_runtime *rtd = substream->private_data; 1258 struct snd_soc_pcm_runtime *rtd = substream->private_data;
1257 struct snd_soc_device *socdev = rtd->socdev; 1259 struct snd_soc_device *socdev = rtd->socdev;
1258 struct snd_soc_codec *codec = socdev->codec; 1260 struct snd_soc_codec *codec = socdev->card->codec;
1259 struct twl4030_priv *twl4030 = codec->private_data; 1261 struct twl4030_priv *twl4030 = codec->private_data;
1260 1262
1261 if (twl4030->master_substream == substream) 1263 if (twl4030->master_substream == substream)