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

Unverified Commit 28b698b7 authored by Dan Carpenter's avatar Dan Carpenter Committed by Mark Brown
Browse files

ASoC: pcm512x: Fix a double unlock in pcm512x_digital_mute() 



We accidentally call mutex_unlock(&pcm512x->mutex); twice in a row.

I re-wrote the error handling to use "goto unlock;" instead of returning
directly.  Hopefully, it makes the code a little simpler.

Fixes: 3500f1c5 ("ASoC: pcm512x: Implement the digital_mute interface")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reviwed-by: default avatarDimitris Papavasiliou <dpapavas@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent fd270fca

sound/soc/codecs/pcm512x.c

+4 −7
Original line number Diff line number Diff line
@@ -1400,24 +1400,20 @@ static int pcm512x_digital_mute(struct snd_soc_dai *dai, int mute) 
		if (ret != 0) {

			dev_err(component->dev,

				"Failed to set digital mute: %d\n", ret);

			mutex_unlock(&pcm512x->mutex);

			return ret;

			goto unlock;

		}



		regmap_read_poll_timeout(pcm512x->regmap,

					 PCM512x_ANALOG_MUTE_DET,

					 mute_det, (mute_det & 0x3) == 0,

					 200, 10000);



		mutex_unlock(&pcm512x->mutex);

	} else {

		pcm512x->mute &= ~0x1;

		ret = pcm512x_update_mute(pcm512x);

		if (ret != 0) {

			dev_err(component->dev,

				"Failed to update digital mute: %d\n", ret);

			mutex_unlock(&pcm512x->mutex);

			return ret;

			goto unlock;

		}



		regmap_read_poll_timeout(pcm512x->regmap,
@@ -1428,9 +1424,10 @@ static int pcm512x_digital_mute(struct snd_soc_dai *dai, int mute) 
					 200, 10000);

	}



unlock:

	mutex_unlock(&pcm512x->mutex);



	return 0;

	return ret;

}



static const struct snd_soc_dai_ops pcm512x_dai_ops = {