media: rcar-vin: Free buffers with error if hardware stop fails

The driver already has logic to detect if it fails to stop properly and
report this error to the user. The driver however did not report the
unused buffers or buffers given to the hardware (if any) with an error,
the buffers where instead returned to user-space in the active state.

Build on the existing detection of the error condition and correctly
return the buffers with an error if it triggers.

Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/platform/rcar-vin/rcar-dma.c b/drivers/media/platform/rcar-vin/rcar-dma.c
index 25ead9333d0046e7baabe2bfc6ac4d23da6c52b4..79bb9081853f8781c05b8198c94491907a4eba5c 100644 (file)
--- a/drivers/media/platform/rcar-vin/rcar-dma.c
+++ b/drivers/media/platform/rcar-vin/rcar-dma.c
@@ -1371,6 +1371,16 @@ void rvin_stop_streaming(struct rvin_dev *vin)
 
        spin_unlock_irqrestore(&vin->qlock, flags);
 
+       /* If something went wrong, free buffers with an error. */
+       if (!buffersFreed) {
+               return_unused_buffers(vin, VB2_BUF_STATE_ERROR);
+               for (i = 0; i < HW_BUFFER_NUM; i++) {
+                       if (vin->buf_hw[i].buffer)
+                               vb2_buffer_done(&vin->buf_hw[i].buffer->vb2_buf,
+                                               VB2_BUF_STATE_ERROR);
+               }
+       }
+
        rvin_set_stream(vin, 0);
 
        /* disable interrupts */