media: vivid: drop v4l2_ctrl_request_complete() from start_streaming

Hans Verkuil · mchehab · commit e714c92f42ae · 2018-12-03T15:04:07.000-05:00
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: Hans Verkuil &lt;hverkuil-cisco@xs4all.nl&gt;
Acked-by: Sakari Ailus &lt;sakari.ailus@linux.intel.com&gt;
Signed-off-by: Hans Verkuil &lt;hverkuil-cisco@xs4all.nl&gt;
Signed-off-by: Mauro Carvalho Chehab &lt;mchehab+samsung@kernel.org&gt;
diff --git a/drivers/media/platform/vivid/vivid-sdr-cap.c b/drivers/media/platform/vivid/vivid-sdr-cap.c
@@ -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);
 		}
diff --git a/drivers/media/platform/vivid/vivid-vbi-cap.c b/drivers/media/platform/vivid/vivid-vbi-cap.c
@@ -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);
 		}
diff --git a/drivers/media/platform/vivid/vivid-vbi-out.c b/drivers/media/platform/vivid/vivid-vbi-out.c
@@ -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);
 		}
diff --git a/drivers/media/platform/vivid/vivid-vid-cap.c b/drivers/media/platform/vivid/vivid-vid-cap.c
@@ -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);
 		}
diff --git a/drivers/media/platform/vivid/vivid-vid-out.c b/drivers/media/platform/vivid/vivid-vid-out.c
@@ -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);
 		}

Original file line number	Diff line number	Diff line change
`@@ -276,8 +276,6 @@ static int sdr_cap_start_streaming(struct vb2_queue *vq, unsigned count)`
`276`	`276`
`277`	`277`	`list_for_each_entry_safe(buf, tmp, &dev->sdr_cap_active, list) {`
`278`	`278`	`list_del(&buf->list);`
`279`		`- v4l2_ctrl_request_complete(buf->vb.vb2_buf.req_obj.req,`
`280`		`- &dev->ctrl_hdl_sdr_cap);`
`281`	`279`	`vb2_buffer_done(&buf->vb.vb2_buf,`
`282`	`280`	`VB2_BUF_STATE_QUEUED);`
`283`	`281`	`}`
Original file line number	Diff line number	Diff line change
`@@ -204,8 +204,6 @@ static int vbi_cap_start_streaming(struct vb2_queue *vq, unsigned count)`
`204`	`204`
`205`	`205`	`list_for_each_entry_safe(buf, tmp, &dev->vbi_cap_active, list) {`
`206`	`206`	`list_del(&buf->list);`
`207`		`- v4l2_ctrl_request_complete(buf->vb.vb2_buf.req_obj.req,`
`208`		`- &dev->ctrl_hdl_vbi_cap);`
`209`	`207`	`vb2_buffer_done(&buf->vb.vb2_buf,`
`210`	`208`	`VB2_BUF_STATE_QUEUED);`
`211`	`209`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,8 +96,6 @@ static int vbi_out_start_streaming(struct vb2_queue *vq, unsigned count)`
`96`	`96`
`97`	`97`	`list_for_each_entry_safe(buf, tmp, &dev->vbi_out_active, list) {`
`98`	`98`	`list_del(&buf->list);`
`99`		`- v4l2_ctrl_request_complete(buf->vb.vb2_buf.req_obj.req,`
`100`		`- &dev->ctrl_hdl_vbi_out);`
`101`	`99`	`vb2_buffer_done(&buf->vb.vb2_buf,`
`102`	`100`	`VB2_BUF_STATE_QUEUED);`
`103`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -243,8 +243,6 @@ static int vid_cap_start_streaming(struct vb2_queue *vq, unsigned count)`
`243`	`243`
`244`	`244`	`list_for_each_entry_safe(buf, tmp, &dev->vid_cap_active, list) {`
`245`	`245`	`list_del(&buf->list);`
`246`		`- v4l2_ctrl_request_complete(buf->vb.vb2_buf.req_obj.req,`
`247`		`- &dev->ctrl_hdl_vid_cap);`
`248`	`246`	`vb2_buffer_done(&buf->vb.vb2_buf,`
`249`	`247`	`VB2_BUF_STATE_QUEUED);`
`250`	`248`	`}`
Original file line number	Diff line number	Diff line change
`@@ -162,8 +162,6 @@ static int vid_out_start_streaming(struct vb2_queue *vq, unsigned count)`
`162`	`162`
`163`	`163`	`list_for_each_entry_safe(buf, tmp, &dev->vid_out_active, list) {`
`164`	`164`	`list_del(&buf->list);`
`165`		`- v4l2_ctrl_request_complete(buf->vb.vb2_buf.req_obj.req,`
`166`		`- &dev->ctrl_hdl_vid_out);`
`167`	`165`	`vb2_buffer_done(&buf->vb.vb2_buf,`
`168`	`166`	`VB2_BUF_STATE_QUEUED);`
`169`	`167`	`}`