Commit 4d10452c authored by Dafna Hirschfeld's avatar Dafna Hirschfeld Committed by Mauro Carvalho Chehab
Browse files

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



'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>
parent fb56f4be

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

+3 −3
Original line number Diff line number Diff line
@@ -1620,12 +1620,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;