|
@@ -44,10 +44,8 @@ static int spitz_jack_func;
|
|
static int spitz_spk_func;
|
|
static int spitz_spk_func;
|
|
static int spitz_mic_gpio;
|
|
static int spitz_mic_gpio;
|
|
|
|
|
|
-static void spitz_ext_control(struct snd_soc_card *card)
|
|
|
|
|
|
+static void spitz_ext_control(struct snd_soc_dapm_context *dapm)
|
|
{
|
|
{
|
|
- struct snd_soc_dapm_context *dapm = &card->dapm;
|
|
|
|
-
|
|
|
|
if (spitz_spk_func == SPITZ_SPK_ON)
|
|
if (spitz_spk_func == SPITZ_SPK_ON)
|
|
snd_soc_dapm_enable_pin(dapm, "Ext Spk");
|
|
snd_soc_dapm_enable_pin(dapm, "Ext Spk");
|
|
else
|
|
else
|
|
@@ -113,7 +111,7 @@ static int spitz_startup(struct snd_pcm_substream *substream)
|
|
mutex_lock(&codec->mutex);
|
|
mutex_lock(&codec->mutex);
|
|
|
|
|
|
/* check the jack status at stream startup */
|
|
/* check the jack status at stream startup */
|
|
- spitz_ext_control(codec);
|
|
|
|
|
|
+ spitz_ext_control(&codec->dapm);
|
|
|
|
|
|
mutex_unlock(&codec->mutex);
|
|
mutex_unlock(&codec->mutex);
|
|
|
|
|
|
@@ -179,7 +177,7 @@ static int spitz_set_jack(struct snd_kcontrol *kcontrol,
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
spitz_jack_func = ucontrol->value.integer.value[0];
|
|
spitz_jack_func = ucontrol->value.integer.value[0];
|
|
- spitz_ext_control(card);
|
|
|
|
|
|
+ spitz_ext_control(&card->dapm);
|
|
return 1;
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -193,13 +191,13 @@ static int spitz_get_spk(struct snd_kcontrol *kcontrol,
|
|
static int spitz_set_spk(struct snd_kcontrol *kcontrol,
|
|
static int spitz_set_spk(struct snd_kcontrol *kcontrol,
|
|
struct snd_ctl_elem_value *ucontrol)
|
|
struct snd_ctl_elem_value *ucontrol)
|
|
{
|
|
{
|
|
- struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
|
|
|
|
|
|
+ struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
|
|
|
|
|
|
if (spitz_spk_func == ucontrol->value.integer.value[0])
|
|
if (spitz_spk_func == ucontrol->value.integer.value[0])
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
spitz_spk_func = ucontrol->value.integer.value[0];
|
|
spitz_spk_func = ucontrol->value.integer.value[0];
|
|
- spitz_ext_control(card);
|
|
|
|
|
|
+ spitz_ext_control(&card->dapm);
|
|
return 1;
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
|