Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c335e76a authored by Dafna Hirschfeld's avatar Dafna Hirschfeld Committed by Greg Kroah-Hartman
Browse files

media: vicodec: upon release, call m2m release before freeing ctrl handler 



commit 4d10452cd1ed619d95fde81cef837069f4c754cd upstream.

'v4l2_m2m_ctx_release' calls request complete
so it should be called before 'v4l2_ctrl_handler_free'.

Signed-off-by: default avatarDafna Hirschfeld <dafna3@gmail.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Cc: Minh Yuan <yuanmingbuaa@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d54b97b3

drivers/media/platform/vicodec/vicodec-core.c

+3 −3
Original line number Diff line number Diff line
@@ -1297,12 +1297,12 @@ static int vicodec_release(struct file *file) 
	struct video_device *vfd = video_devdata(file);

	struct vicodec_ctx *ctx = file2ctx(file);



	v4l2_fh_del(&ctx->fh);

	v4l2_fh_exit(&ctx->fh);

	v4l2_ctrl_handler_free(&ctx->hdl);

	mutex_lock(vfd->lock);

	v4l2_m2m_ctx_release(ctx->fh.m2m_ctx);

	mutex_unlock(vfd->lock);

	v4l2_fh_del(&ctx->fh);

	v4l2_fh_exit(&ctx->fh);

	v4l2_ctrl_handler_free(&ctx->hdl);

	kfree(ctx);



	return 0;