Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
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>
authored by Peter Ujfalusi and committed by Mark Brown d6648da1 5c15a686
+6
-4
sound/soc/codecs/twl4030.c
+6
-4
sound/soc/codecs/twl4030.c
···
1220
return 0;
1221
}
1222
1223
-
static int twl4030_startup(struct snd_pcm_substream *substream)
1224
{
1225
struct snd_soc_pcm_runtime *rtd = substream->private_data;
1226
struct snd_soc_device *socdev = rtd->socdev;
1227
-
struct snd_soc_codec *codec = socdev->codec;
1228
struct twl4030_priv *twl4030 = codec->private_data;
1229
1230
/* If we already have a playback or capture going then constrain
···
1252
return 0;
1253
}
1254
1255
-
static void twl4030_shutdown(struct snd_pcm_substream *substream)
1256
{
1257
struct snd_soc_pcm_runtime *rtd = substream->private_data;
1258
struct snd_soc_device *socdev = rtd->socdev;
1259
-
struct snd_soc_codec *codec = socdev->codec;
1260
struct twl4030_priv *twl4030 = codec->private_data;
1261
1262
if (twl4030->master_substream == substream)
···
1220
return 0;
1221
}
1222
1223
+
static int twl4030_startup(struct snd_pcm_substream *substream,
1224
+
struct snd_soc_dai *dai)
1225
{
1226
struct snd_soc_pcm_runtime *rtd = substream->private_data;
1227
struct snd_soc_device *socdev = rtd->socdev;
1228
+
struct snd_soc_codec *codec = socdev->card->codec;
1229
struct twl4030_priv *twl4030 = codec->private_data;
1230
1231
/* If we already have a playback or capture going then constrain
···
1251
return 0;
1252
}
1253
1254
+
static void twl4030_shutdown(struct snd_pcm_substream *substream,
1255
+
struct snd_soc_dai *dai)
1256
{
1257
struct snd_soc_pcm_runtime *rtd = substream->private_data;
1258
struct snd_soc_device *socdev = rtd->socdev;
1259
+
struct snd_soc_codec *codec = socdev->card->codec;
1260
struct twl4030_priv *twl4030 = codec->private_data;
1261
1262
if (twl4030->master_substream == substream)