Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

parents 448c3f68 d63733ae

sound/soc/codecs/ab8500-codec.c

+6 −1
Original line number Diff line number Diff line
@@ -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 device *dev = codec->dev;

	bool apply_fir, apply_iir;

	int req, status;

	unsigned int req;

	int status;



	dev_dbg(dev, "%s: Enter.\n", __func__);



	mutex_lock(&drvdata->anc_lock);



	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 &&

		req != ANC_APPLY_IIR) {

		dev_err(dev, "%s: ERROR: Unsupported status to set '%s'!\n",