* [patch] staging: bcm2835/mmal-vchiq: unlock on error in buffer_from_host()
@ 2017-02-17 23:20 Dan Carpenter
0 siblings, 0 replies; only message in thread
From: Dan Carpenter @ 2017-02-17 23:20 UTC (permalink / raw)
To: Mauro Carvalho Chehab, Eric Anholt
Cc: Greg Kroah-Hartman, Stephen Warren, Lee Jones, Florian Fainelli,
Ray Jui, Scott Branden, bcm-kernel-feedback-list, Michael Zoran,
linux-media, devel, linux-rpi-kernel, kernel-janitors
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>
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;
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2017-02-17 23:20 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-17 23:20 [patch] staging: bcm2835/mmal-vchiq: unlock on error in buffer_from_host() Dan Carpenter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox