mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-08-30 23:59:33 -04:00
media: mali-c55: Drop redundant mutex_destroy in capture register error path
In mali_c55_register_cap_dev(), a failure of media_entity_pads_init() destroys cap_dev->lock inline and then jumps to err_destroy_mutex, which destroys the same mutex a second time. Calling mutex_destroy() twice is harmless, so this is not a bugfix, but the inline call is redundant: the err_destroy_mutex label already covers this path, just like the switch default case immediately above. Drop the inline mutex_destroy() and rely solely on the err_destroy_mutex label, so the mutex is destroyed exactly once on every error path. Signed-off-by: David Carlier <devnexen@gmail.com> Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com> Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>
This commit is contained in:
committed by
Hans Verkuil
parent
2447c768cb
commit
876006e994
@@ -857,10 +857,8 @@ static int mali_c55_register_cap_dev(struct mali_c55 *mali_c55,
|
||||
|
||||
cap_dev->pad.flags = MEDIA_PAD_FL_SINK;
|
||||
ret = media_entity_pads_init(&cap_dev->vdev.entity, 1, &cap_dev->pad);
|
||||
if (ret) {
|
||||
mutex_destroy(&cap_dev->lock);
|
||||
if (ret)
|
||||
goto err_destroy_mutex;
|
||||
}
|
||||
|
||||
vb2q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
|
||||
vb2q->io_modes = VB2_MMAP | VB2_DMABUF;
|
||||
|
||||
Reference in New Issue
Block a user