Commit e714c92f authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

media: vivid: drop v4l2_ctrl_request_complete() from start_streaming 



If start_streaming() fails and all queued buffers are returned to
vb2, then do not call v4l2_ctrl_request_complete(). Nothing happened
to the request and the state should remain as it was before
start_streaming was called.

Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent dde6bdcc

drivers/media/platform/vivid/vivid-sdr-cap.c

+0 −2
Original line number Diff line number Diff line
@@ -276,8 +276,6 @@ static int sdr_cap_start_streaming(struct vb2_queue *vq, unsigned count) 


		list_for_each_entry_safe(buf, tmp, &dev->sdr_cap_active, list) {

			list_del(&buf->list);

			v4l2_ctrl_request_complete(buf->vb.vb2_buf.req_obj.req,

						   &dev->ctrl_hdl_sdr_cap);

			vb2_buffer_done(&buf->vb.vb2_buf,

					VB2_BUF_STATE_QUEUED);

		}

drivers/media/platform/vivid/vivid-vbi-cap.c

+0 −2
Original line number Diff line number Diff line
@@ -204,8 +204,6 @@ static int vbi_cap_start_streaming(struct vb2_queue *vq, unsigned count) 


		list_for_each_entry_safe(buf, tmp, &dev->vbi_cap_active, list) {

			list_del(&buf->list);

			v4l2_ctrl_request_complete(buf->vb.vb2_buf.req_obj.req,

						   &dev->ctrl_hdl_vbi_cap);

			vb2_buffer_done(&buf->vb.vb2_buf,

					VB2_BUF_STATE_QUEUED);

		}

drivers/media/platform/vivid/vivid-vbi-out.c

+0 −2
Original line number Diff line number Diff line
@@ -96,8 +96,6 @@ static int vbi_out_start_streaming(struct vb2_queue *vq, unsigned count) 


		list_for_each_entry_safe(buf, tmp, &dev->vbi_out_active, list) {

			list_del(&buf->list);

			v4l2_ctrl_request_complete(buf->vb.vb2_buf.req_obj.req,

						   &dev->ctrl_hdl_vbi_out);

			vb2_buffer_done(&buf->vb.vb2_buf,

					VB2_BUF_STATE_QUEUED);

		}

drivers/media/platform/vivid/vivid-vid-cap.c

+0 −2
Original line number Diff line number Diff line
@@ -243,8 +243,6 @@ static int vid_cap_start_streaming(struct vb2_queue *vq, unsigned count) 


		list_for_each_entry_safe(buf, tmp, &dev->vid_cap_active, list) {

			list_del(&buf->list);

			v4l2_ctrl_request_complete(buf->vb.vb2_buf.req_obj.req,

						   &dev->ctrl_hdl_vid_cap);

			vb2_buffer_done(&buf->vb.vb2_buf,

					VB2_BUF_STATE_QUEUED);

		}

drivers/media/platform/vivid/vivid-vid-out.c

+0 −2
Original line number Diff line number Diff line
@@ -162,8 +162,6 @@ static int vid_out_start_streaming(struct vb2_queue *vq, unsigned count) 


		list_for_each_entry_safe(buf, tmp, &dev->vid_out_active, list) {

			list_del(&buf->list);

			v4l2_ctrl_request_complete(buf->vb.vb2_buf.req_obj.req,

						   &dev->ctrl_hdl_vid_out);

			vb2_buffer_done(&buf->vb.vb2_buf,

					VB2_BUF_STATE_QUEUED);

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE