From 5aef21f63f0162757fd96d6f3c0829c683d6f185 Mon Sep 17 00:00:00 2001 From: Liam Girdwood Date: Thu, 16 Feb 2012 12:00:23 +0000 Subject: [PATCH] --- yaml --- r: 293355 b: refs/heads/master c: 0e66821f63b3bf1468f5793759beb09b3e1ffa4f h: refs/heads/master i: 293353: b83783cc77495459f05f42724d7fa3e45eac0f6b 293351: fe7b743e1ce91b56bd2afa90426e5c0b178e9c93 v: v3 --- [refs] | 2 +- trunk/sound/soc/pxa/spitz.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 064e072f5560..b6cde850e72b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 905b41956c81e5914470a13a166d4b4c4ee71f92 +refs/heads/master: 0e66821f63b3bf1468f5793759beb09b3e1ffa4f diff --git a/trunk/sound/soc/pxa/spitz.c b/trunk/sound/soc/pxa/spitz.c index 90c5245c4742..4d108dc52e2e 100644 --- a/trunk/sound/soc/pxa/spitz.c +++ b/trunk/sound/soc/pxa/spitz.c @@ -44,9 +44,9 @@ static int spitz_jack_func; static int spitz_spk_func; static int spitz_mic_gpio; -static void spitz_ext_control(struct snd_soc_codec *codec) +static void spitz_ext_control(struct snd_soc_card *card) { - struct snd_soc_dapm_context *dapm = &codec->dapm; + struct snd_soc_dapm_context *dapm = &card->dapm; if (spitz_spk_func == SPITZ_SPK_ON) snd_soc_dapm_enable_pin(dapm, "Ext Spk"); @@ -173,13 +173,13 @@ static int spitz_get_jack(struct snd_kcontrol *kcontrol, static int spitz_set_jack(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct snd_soc_card *card = snd_kcontrol_chip(kcontrol); if (spitz_jack_func == ucontrol->value.integer.value[0]) return 0; spitz_jack_func = ucontrol->value.integer.value[0]; - spitz_ext_control(codec); + spitz_ext_control(card); return 1; } @@ -193,13 +193,13 @@ static int spitz_get_spk(struct snd_kcontrol *kcontrol, static int spitz_set_spk(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct snd_soc_card *card = snd_kcontrol_chip(kcontrol); if (spitz_spk_func == ucontrol->value.integer.value[0]) return 0; spitz_spk_func = ucontrol->value.integer.value[0]; - spitz_ext_control(codec); + spitz_ext_control(card); return 1; }