system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-09 04:43:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: bcm2835/mmal-vchiq: unlock on error in buffer_from_host()

Browse source 
We should unlock before returning on this error path.

Fixes: 7b3ad5abf0 ("staging: Import the BCM2835 MMAL-based V4L2 camera driver.")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Dan Carpenter 2017-02-18 02:20:36 +03:00 committed by Greg Kroah-Hartman
parent dc7ffefdcc
commit f4082c6f28
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/staging/media/platform/bcm2835/mmal-vchiq.c
View file

@ -397,8 +397,10 @@ buffer_from_host(struct vchiq_mmal_instance *instance,
/* get context */
msg_context = get_msg_context(instance);
if (msg_context == NULL)
return -ENOMEM;
if (!msg_context) {
ret = -ENOMEM;
goto unlock;
}
/* store bulk message context for when data arrives */
msg_context->u.bulk.instance = instance;
@ -454,6 +456,7 @@ buffer_from_host(struct vchiq_mmal_instance *instance,
vchi_service_release(instance->handle);
unlock:
mutex_unlock(&instance->bulk_mutex);
return ret;