diff options
| author | Peter Ujfalusi <peter.ujfalusi@nokia.com> | 2009-04-07 09:14:00 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-07 10:52:00 +0100 |
| commit | d6648da122870ff42bc720da25483bdb8bc868f8 (patch) | |
| tree | f9c079cd770dc46795f3af6c3610b65fa8de771e /sound/soc | |
| parent | 5c15a6869a75000fecea61e9985f4753311ec534 (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/soc')
| -rw-r--r-- | sound/soc/codecs/twl4030.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index bfda7a88e825..921b205de28a 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, return 0; } -static int twl4030_startup(struct snd_pcm_substream *substream) +static int twl4030_startup(struct snd_pcm_substream *substream, + struct snd_soc_dai *dai) { struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_device *socdev = rtd->socdev; - struct snd_soc_codec *codec = socdev->codec; + struct snd_soc_codec *codec = socdev->card->codec; struct twl4030_priv *twl4030 = codec->private_data; /* If we already have a playback or capture going then constrain @@ -1251,11 +1252,12 @@ static int twl4030_startup(struct snd_pcm_substream *substream) return 0; } -static void twl4030_shutdown(struct snd_pcm_substream *substream) +static void twl4030_shutdown(struct snd_pcm_substream *substream, + struct snd_soc_dai *dai) { struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_device *socdev = rtd->socdev; - struct snd_soc_codec *codec = socdev->codec; + struct snd_soc_codec *codec = socdev->card->codec; struct twl4030_priv *twl4030 = codec->private_data; if (twl4030->master_substream == substream) |