tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds 985c0cd3 81d91acf

+6 -4
unified split
+6 -4
sound/soc/codecs/twl4030.c
··· 1220 1220 return 0; 1221 1221 } 1222 1222 1223 - static int twl4030_startup(struct snd_pcm_substream *substream) 1223 + static int twl4030_startup(struct snd_pcm_substream *substream, 1224 + struct snd_soc_dai *dai) 1224 1225 { 1225 1226 struct snd_soc_pcm_runtime *rtd = substream->private_data; 1226 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 1229 struct twl4030_priv *twl4030 = codec->private_data; 1229 1230 1230 1231 /* If we already have a playback or capture going then constrain ··· 1252 1251 return 0; 1253 1252 } 1254 1253 1255 - static void twl4030_shutdown(struct snd_pcm_substream *substream) 1254 + static void twl4030_shutdown(struct snd_pcm_substream *substream, 1255 + struct snd_soc_dai *dai) 1256 1256 { 1257 1257 struct snd_soc_pcm_runtime *rtd = substream->private_data; 1258 1258 struct snd_soc_device *socdev = rtd->socdev; 1259 - struct snd_soc_codec *codec = socdev->codec; 1259 + struct snd_soc_codec *codec = socdev->card->codec; 1260 1260 struct twl4030_priv *twl4030 = codec->private_data; 1261 1261 1262 1262 if (twl4030->master_substream == substream)