Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-16 01:54:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark Brown 2013-09-27 14:56:20 +01:00
commit 92396e78d3
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sound/soc/codecs/ab8500-codec.c
View File

@ -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",