Skip to content

L
linux
Commit 92396e78 authored by Mark Brown's avatar Mark Brown
Browse files
Options

Merge remote-tracking branch 'asoc/fix/ab8500' into asoc-linus

parents 448c3f68 d63733ae
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 1 deletion
sound/soc/codecs/ab8500-codec.c
View file @ 92396e78
...@@ -1225,13 +1225,18 @@ static int anc_status_control_put(struct snd_kcontrol *kcontrol, ...@@ -1225,13 +1225,18 @@ static int anc_status_control_put(struct snd_kcontrol *kcontrol,
struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(codec->dev); struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(codec->dev);
struct device *dev = codec->dev; struct device *dev = codec->dev;
bool apply_fir, apply_iir; bool apply_fir, apply_iir;
int req, status; unsigned int req;
int status;
dev_dbg(dev, "%s: Enter.\n", __func__); dev_dbg(dev, "%s: Enter.\n", __func__);
mutex_lock(&drvdata->anc_lock); mutex_lock(&drvdata->anc_lock);
req = ucontrol->value.integer.value[0]; req = ucontrol->value.integer.value[0];
if (req >= ARRAY_SIZE(enum_anc_state)) {
status = -EINVAL;
goto cleanup;
}
if (req != ANC_APPLY_FIR_IIR && req != ANC_APPLY_FIR && if (req != ANC_APPLY_FIR_IIR && req != ANC_APPLY_FIR &&
req != ANC_APPLY_IIR) { req != ANC_APPLY_IIR) {
dev_err(dev, "%s: ERROR: Unsupported status to set '%s'!\n", dev_err(dev, "%s: ERROR: Unsupported status to set '%s'!\n",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7