Merge "ASoC: msm: qdspv2: Fix missing mutex unlock in LSM client driver" (a53358e2) · Commits · e / devices / android_kernel_fairphone_FP3

sound/soc/msm/qdsp6v2/msm-lsm-client.c

+9 −5

Original line number	Diff line number	Diff line
		@@ -1682,7 +1682,7 @@ static int msm_lsm_ioctl(struct snd_pcm_substream *substream,
		dev_err(rtd->dev,
		"%s REG_SND_MODEL failed err %d\n",
		__func__, err);
		return err;
		goto done;
		}
		break;
		case SNDRV_LSM_SET_PARAMS: {
		@@ -1852,13 +1852,15 @@ static int msm_lsm_ioctl(struct snd_pcm_substream *substream,
		dev_err(rtd->dev,
		"%s: Invalid params event_status_v3\n",
		__func__);
		return -EINVAL;
		err = -EINVAL;
		goto done;
		}
		if (copy_from_user(&userarg, arg, sizeof(userarg))) {
		dev_err(rtd->dev,
		"%s: err copyuser event_status_v3\n",
		__func__);
		return -EFAULT;
		err = -EFAULT;
		goto done;
		}

		if (userarg.payload_size >
		@@ -1866,7 +1868,8 @@ static int msm_lsm_ioctl(struct snd_pcm_substream *substream,
		pr_err("%s: payload_size %d is invalid, max allowed = %d\n",
		__func__, userarg.payload_size,
		LISTEN_MAX_STATUS_PAYLOAD_SIZE);
		return -EINVAL;
		err = -EINVAL;
		goto done;
		}

		size = sizeof(struct snd_lsm_event_status_v3) +
		@@ -1876,7 +1879,8 @@ static int msm_lsm_ioctl(struct snd_pcm_substream *substream,
		dev_err(rtd->dev,
		"%s: Allocation failed event status size %d\n",
		__func__, size);
		return -EFAULT;
		err = -EFAULT;
		goto done;
		}
		user->payload_size = userarg.payload_size;
		err = msm_lsm_ioctl_shared(substream, cmd, user);