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

We should unlock before returning on this error path.

Fixes: 7b3ad5abf027 ("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>

diff --git a/drivers/staging/media/platform/bcm2835/mmal-vchiq.c b/drivers/staging/media/platform/bcm2835/mmal-vchiq.c
index f0639ee6c8b9984872aaefc9d277300f6ca2f9fc..fdfb6a620a4314ad201ba0f3b09a1de09259d4eb 100644 (file)
--- a/drivers/staging/media/platform/bcm2835/mmal-vchiq.c
+++ b/drivers/staging/media/platform/bcm2835/mmal-vchiq.c
@@ -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;