Merge "drivers: qdsp6v2: Add mutex unlock to properly release lock" (5a9314dd) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/misc/qcom/qdsp6v2/audio_hwacc_effects.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -161,7 +161,6 @@ static int audio_effects_shared_ioctl(struct file *file, unsigned cmd,
		pr_err("%s: Read buffer Allocation failed rc = %d\n",
		__func__, rc);
		rc = -ENOMEM;
		mutex_unlock(&effects->lock);
		goto readbuf_fail;
		}
		atomic_set(&effects->out_count, effects->config.output.num_buf);
		@@ -176,7 +175,6 @@ static int audio_effects_shared_ioctl(struct file *file, unsigned cmd,
		if (rc < 0) {
		pr_err("%s: pcm read block config failed\n", __func__);
		rc = -EINVAL;
		mutex_unlock(&effects->lock);
		goto cfg_fail;
		}
		pr_debug("%s: dec: sample_rate: %d, num_channels: %d, bit_width: %d\n",
		@@ -191,7 +189,6 @@ static int audio_effects_shared_ioctl(struct file *file, unsigned cmd,
		pr_err("%s: pcm write format block config failed\n",
		__func__);
		rc = -EINVAL;
		mutex_unlock(&effects->lock);
		goto cfg_fail;
		}

		@@ -325,6 +322,7 @@ ioctl_fail:
		readbuf_fail:
		q6asm_audio_client_buf_free_contiguous(IN,
		effects->ac);
		mutex_unlock(&effects->lock);
		return rc;
		cfg_fail:
		q6asm_audio_client_buf_free_contiguous(IN,
		@@ -332,6 +330,7 @@ cfg_fail:
		q6asm_audio_client_buf_free_contiguous(OUT,
		effects->ac);
		effects->buf_alloc = 0;
		mutex_unlock(&effects->lock);
		return rc;
		}