diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2017-02-18 02:20:36 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-26 17:05:48 +0100 |
| commit | f4082c6f28a8e77dcb694c6f23de9e533251051d (patch) | |
| tree | 7118ef180f995d26bc56962bd0a4b035f77d4f6d /drivers | |
| parent | dc7ffefdcc28a45214aa707fdc3df6a5e611ba09 (diff) | |
| download | linux-stable-f4082c6f28a8e77dcb694c6f23de9e533251051d.tar.gz linux-stable-f4082c6f28a8e77dcb694c6f23de9e533251051d.tar.bz2 linux-stable-f4082c6f28a8e77dcb694c6f23de9e533251051d.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/media/platform/bcm2835/mmal-vchiq.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/staging/media/platform/bcm2835/mmal-vchiq.c b/drivers/staging/media/platform/bcm2835/mmal-vchiq.c index f0639ee6c8b9..fdfb6a620a43 100644 --- 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; |