Commit 3a04d986 authored by Jernej Skrabec's avatar Jernej Skrabec Committed by Hans Verkuil
Browse files

media: cedrus: initialize controls a bit later 



While it doesn't matter if controls are initialized before or after
queues and formats from open handler standpoint, initializing them last
helps keeping s_ctrl handler simpler, since everything has already valid
values.

This is just preparation for follow up changes. No functional change is
intended.

Signed-off-by: default avatarJernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent e240c003

drivers/staging/media/sunxi/cedrus/cedrus.c

+7 −7
Original line number Diff line number Diff line
@@ -355,27 +355,27 @@ static int cedrus_open(struct file *file) 
	file->private_data = &ctx->fh;

	ctx->dev = dev;



	ret = cedrus_init_ctrls(dev, ctx);

	if (ret)

		goto err_free;



	ctx->fh.m2m_ctx = v4l2_m2m_ctx_init(dev->m2m_dev, ctx,

					    &cedrus_queue_init);

	if (IS_ERR(ctx->fh.m2m_ctx)) {

		ret = PTR_ERR(ctx->fh.m2m_ctx);

		goto err_ctrls;

		goto err_free;

	}



	cedrus_reset_out_format(ctx);



	ret = cedrus_init_ctrls(dev, ctx);

	if (ret)

		goto err_m2m_release;



	v4l2_fh_add(&ctx->fh);



	mutex_unlock(&dev->dev_mutex);



	return 0;



err_ctrls:

	v4l2_ctrl_handler_free(&ctx->hdl);

err_m2m_release:

	v4l2_m2m_ctx_release(ctx->fh.m2m_ctx);

err_free:

	kfree(ctx);

	mutex_unlock(&dev->dev_mutex);