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

Commit c4a62733 authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mauro Carvalho Chehab
Browse files

[media] s5p-fimc: Do not allow changing format after REQBUFS 



Protecting the color format with vb2_is_streaming() is not sufficient
as this prevents changing the format only after VIDIOC_STREAMON.
To prevent the color format reconfiguration as soon as buffers
are allocated use vb2_is_busy() instead.
Also make the videobuf queue ops structure static.

Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 25b9875f

drivers/media/video/s5p-fimc/fimc-capture.c

+1 −1
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ static int fimc_cap_s_fmt_mplane(struct file *file, void *priv, 
	if (ret)

		return ret;



	if (vb2_is_streaming(&fimc->vid_cap.vbq) || fimc_capture_active(fimc))

	if (vb2_is_busy(&fimc->vid_cap.vbq) || fimc_capture_active(fimc))

		return -EBUSY;



	frame = &ctx->d_frame;

drivers/media/video/s5p-fimc/fimc-core.c

+2 −2
Original line number Diff line number Diff line
@@ -758,7 +758,7 @@ static void fimc_unlock(struct vb2_queue *vq) 
	mutex_unlock(&ctx->fimc_dev->lock);

}



struct vb2_ops fimc_qops = {

static struct vb2_ops fimc_qops = {

	.queue_setup	 = fimc_queue_setup,

	.buf_prepare	 = fimc_buf_prepare,

	.buf_queue	 = fimc_buf_queue,
@@ -965,7 +965,7 @@ static int fimc_m2m_s_fmt_mplane(struct file *file, void *priv, 


	vq = v4l2_m2m_get_vq(ctx->m2m_ctx, f->type);



	if (vb2_is_streaming(vq)) {

	if (vb2_is_busy(vq)) {

		v4l2_err(&fimc->m2m.v4l2_dev, "queue (%d) busy\n", f->type);

		return -EBUSY;

	}