diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 08:54:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 08:54:43 -0700 |
| commit | 985c0cd3f75b5a546ceab002e36b4263f2f7d2c3 (patch) | |
| tree | 7097c68df6679aabab79ede8daa6c0299d98d63e /sound/soc | |
| parent | 81d91acf8c093565f65383ae0349b9255fbb2d0d (diff) | |
| parent | d6648da122870ff42bc720da25483bdb8bc868f8 (diff) | |
| download | lwn-985c0cd3f75b5a546ceab002e36b4263f2f7d2c3.tar.gz lwn-985c0cd3f75b5a546ceab002e36b4263f2f7d2c3.zip | |
Merge branch 'for-2.6.30' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6
* 'for-2.6.30' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6:
ASoC: TWL4030: Compillation error fix
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) |