|
@@ -180,7 +180,7 @@ static int wm9712_hp_mixer_put(struct snd_kcontrol *kcontrol,
|
|
struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kcontrol);
|
|
struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kcontrol);
|
|
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(dapm);
|
|
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(dapm);
|
|
struct wm9712_priv *wm9712 = snd_soc_codec_get_drvdata(codec);
|
|
struct wm9712_priv *wm9712 = snd_soc_codec_get_drvdata(codec);
|
|
- unsigned int val = ucontrol->value.enumerated.item[0];
|
|
|
|
|
|
+ unsigned int val = ucontrol->value.integer.value[0];
|
|
struct soc_mixer_control *mc =
|
|
struct soc_mixer_control *mc =
|
|
(struct soc_mixer_control *)kcontrol->private_value;
|
|
(struct soc_mixer_control *)kcontrol->private_value;
|
|
unsigned int mixer, mask, shift, old;
|
|
unsigned int mixer, mask, shift, old;
|
|
@@ -193,7 +193,7 @@ static int wm9712_hp_mixer_put(struct snd_kcontrol *kcontrol,
|
|
|
|
|
|
mutex_lock(&wm9712->lock);
|
|
mutex_lock(&wm9712->lock);
|
|
old = wm9712->hp_mixer[mixer];
|
|
old = wm9712->hp_mixer[mixer];
|
|
- if (ucontrol->value.enumerated.item[0])
|
|
|
|
|
|
+ if (ucontrol->value.integer.value[0])
|
|
wm9712->hp_mixer[mixer] |= mask;
|
|
wm9712->hp_mixer[mixer] |= mask;
|
|
else
|
|
else
|
|
wm9712->hp_mixer[mixer] &= ~mask;
|
|
wm9712->hp_mixer[mixer] &= ~mask;
|
|
@@ -231,7 +231,7 @@ static int wm9712_hp_mixer_get(struct snd_kcontrol *kcontrol,
|
|
mixer = mc->shift >> 8;
|
|
mixer = mc->shift >> 8;
|
|
shift = mc->shift & 0xff;
|
|
shift = mc->shift & 0xff;
|
|
|
|
|
|
- ucontrol->value.enumerated.item[0] =
|
|
|
|
|
|
+ ucontrol->value.integer.value[0] =
|
|
(wm9712->hp_mixer[mixer] >> shift) & 1;
|
|
(wm9712->hp_mixer[mixer] >> shift) & 1;
|
|
|
|
|
|
return 0;
|
|
return 0;
|