evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

msm: qdsp6v2: fix inconsistent spin_lock

Browse source 
sound/soc/msm/qdsp6v2/msm-lsm-client.c:334 lsm_event_handler() warn:
inconsistent returns 'spin_lock:&prtd->event_lock'

sound/soc/msm/qdsp6v2/msm-lsm-client.c:1635 msm_lsm_ioctl_compat() warn:
inconsistent returns 'mutex:&prtd->lsm_api_lock'

sound/soc/msm/qdsp6v2/msm-lsm-client.c:1914 msm_lsm_ioctl() warn:
inconsistent returns 'mutex:&prtd->lsm_api_lock'

Change-Id: Id1f754702a56ef21952c7f7bc8cf3ebd0a0ebefa
Signed-off-by: David Lin <dtwlin@google.com>
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
This commit is contained in:
David Lin 2017-06-01 20:36:22 -07:00 • committed by Timi
parent 6ee920eb1b
commit 07eeabe655
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sound/soc/msm/qdsp6v2/msm-lsm-client.c
View file

@ -325,6 +325,7 @@ static void lsm_event_handler(uint32_t opcode, uint32_t token,
if (!prtd->event_status) { if (!prtd->event_status) {
dev_err(rtd->dev, "%s: no memory for event status\n", dev_err(rtd->dev, "%s: no memory for event status\n",
__func__); __func__);
spin_unlock_irqrestore(&prtd->event_lock, flags);
return; return;
} }
/* /*
@ -1395,7 +1396,8 @@ static int msm_lsm_ioctl_compat(struct snd_pcm_substream *substream,
if (copy_from_user(&userarg32, arg, sizeof(userarg32))) { if (copy_from_user(&userarg32, arg, sizeof(userarg32))) {
dev_err(rtd->dev, "%s: err copyuser ioctl %s\n", dev_err(rtd->dev, "%s: err copyuser ioctl %s\n",
__func__, "SNDRV_LSM_EVENT_STATUS_V3_32"); __func__, "SNDRV_LSM_EVENT_STATUS_V3_32");
return -EFAULT; err = -EFAULT;
goto done;
} }
if (userarg32.payload_size > if (userarg32.payload_size >
@ -1403,7 +1405,8 @@ static int msm_lsm_ioctl_compat(struct snd_pcm_substream *substream,
pr_err("%s: payload_size %d is invalid, max allowed = %d\n", pr_err("%s: payload_size %d is invalid, max allowed = %d\n",
__func__, userarg32.payload_size, __func__, userarg32.payload_size,
LISTEN_MAX_STATUS_PAYLOAD_SIZE); LISTEN_MAX_STATUS_PAYLOAD_SIZE);
return -EINVAL; err = -EINVAL;
goto done;
} }
size = sizeof(*user) + userarg32.payload_size; size = sizeof(*user) + userarg32.payload_size;
@ -1412,7 +1415,8 @@ static int msm_lsm_ioctl_compat(struct snd_pcm_substream *substream,
dev_err(rtd->dev, dev_err(rtd->dev,
"%s: Allocation failed event status size %d\n", "%s: Allocation failed event status size %d\n",
__func__, size); __func__, size);
return -EFAULT; err = -EFAULT;
goto done;
} }
cmd = SNDRV_LSM_EVENT_STATUS_V3; cmd = SNDRV_LSM_EVENT_STATUS_V3;
user->payload_size = userarg32.payload_size; user->payload_size = userarg32.payload_size;