projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branches 'asoc/topic/ab8500', 'asoc/topic/adau17x1', 'asoc...
[cascardo/linux.git]
/
sound
/
soc
/
codecs
/
ab8500-codec.c
diff --git
a/sound/soc/codecs/ab8500-codec.c
b/sound/soc/codecs/ab8500-codec.c
index
affb192
..
8b1d0c1
100644
(file)
--- a/
sound/soc/codecs/ab8500-codec.c
+++ b/
sound/soc/codecs/ab8500-codec.c
@@
-1130,7
+1130,7
@@
static int sid_status_control_get(struct snd_kcontrol *kcontrol,
struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(codec->dev);
mutex_lock(&drvdata->ctrl_lock);
struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(codec->dev);
mutex_lock(&drvdata->ctrl_lock);
- ucontrol->value.
integer.value
[0] = drvdata->sid_status;
+ ucontrol->value.
enumerated.item
[0] = drvdata->sid_status;
mutex_unlock(&drvdata->ctrl_lock);
return 0;
mutex_unlock(&drvdata->ctrl_lock);
return 0;
@@
-1147,7
+1147,7
@@
static int sid_status_control_put(struct snd_kcontrol *kcontrol,
dev_dbg(codec->dev, "%s: Enter\n", __func__);
dev_dbg(codec->dev, "%s: Enter\n", __func__);
- if (ucontrol->value.
integer.value
[0] != SID_APPLY_FIR) {
+ if (ucontrol->value.
enumerated.item
[0] != SID_APPLY_FIR) {
dev_err(codec->dev,
"%s: ERROR: This control supports '%s' only!\n",
__func__, enum_sid_state[SID_APPLY_FIR]);
dev_err(codec->dev,
"%s: ERROR: This control supports '%s' only!\n",
__func__, enum_sid_state[SID_APPLY_FIR]);
@@
-1199,7
+1199,7
@@
static int anc_status_control_get(struct snd_kcontrol *kcontrol,
struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(codec->dev);
mutex_lock(&drvdata->ctrl_lock);
struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(codec->dev);
mutex_lock(&drvdata->ctrl_lock);
- ucontrol->value.
integer.value
[0] = drvdata->anc_status;
+ ucontrol->value.
enumerated.item
[0] = drvdata->anc_status;
mutex_unlock(&drvdata->ctrl_lock);
return 0;
mutex_unlock(&drvdata->ctrl_lock);
return 0;
@@
-1220,7
+1220,7
@@
static int anc_status_control_put(struct snd_kcontrol *kcontrol,
mutex_lock(&drvdata->ctrl_lock);
mutex_lock(&drvdata->ctrl_lock);
- req = ucontrol->value.
integer.value
[0];
+ req = ucontrol->value.
enumerated.item
[0];
if (req >= ARRAY_SIZE(enum_anc_state)) {
status = -EINVAL;
goto cleanup;
if (req >= ARRAY_SIZE(enum_anc_state)) {
status = -EINVAL;
goto cleanup;
@@
-2134,7
+2134,6
@@
static int ab8500_codec_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
"%s: ERROR: Unsupporter master mask 0x%x\n",
__func__, fmt & SND_SOC_DAIFMT_MASTER_MASK);
return -EINVAL;
"%s: ERROR: Unsupporter master mask 0x%x\n",
__func__, fmt & SND_SOC_DAIFMT_MASTER_MASK);
return -EINVAL;
- break;
}
snd_soc_update_bits(codec, AB8500_DIGIFCONF3, mask, val);
}
snd_soc_update_bits(codec, AB8500_DIGIFCONF3, mask, val);