media: sun6i-isp: params: Unregister pending buffer on cleanup

paulkocialkowski · mchehab · commit 542d3c03fd89 · 2022-12-14T18:12:32.000Z
The state cleanup helper should unregister the pending buffer from the state after returning it to v4l2, like it is done for other buffers in the wait queue. Before this change, the pending buffer from a previous run might have been returned at the beginning of the next run, causing an error. Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> Fixes: e3185e1 ("media: staging: media: Add support for the Allwinner A31 ISP") Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
diff --git a/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_params.c b/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_params.c
@@ -208,6 +208,8 @@ static void sun6i_isp_params_state_cleanup(struct sun6i_isp_device *isp_dev,
 		vb2_buffer = &state->pending->v4l2_buffer.vb2_buf;
 		vb2_buffer_done(vb2_buffer, error ? VB2_BUF_STATE_ERROR :
 				VB2_BUF_STATE_QUEUED);
+
+		state->pending = NULL;
 	}
 
 	list_for_each_entry(isp_buffer, &state->queue, list) {

Original file line number	Diff line number	Diff line change
`@@ -208,6 +208,8 @@ static void sun6i_isp_params_state_cleanup(struct sun6i_isp_device *isp_dev,`
`208`	`208`	`vb2_buffer = &state->pending->v4l2_buffer.vb2_buf;`
`209`	`209`	`vb2_buffer_done(vb2_buffer, error ? VB2_BUF_STATE_ERROR :`
`210`	`210`	`VB2_BUF_STATE_QUEUED);`
	`211`	`+`
	`212`	`+ state->pending = NULL;`
`211`	`213`	`}`
`212`	`214`
`213`	`215`	`list_for_each_entry(isp_buffer, &state->queue, list) {`