diff options
author | 2022-10-23 21:13:01 +0100 | |
---|---|---|
committer | 2022-11-25 08:18:44 +0000 | |
commit | 36c953e1efa8249fb2d85a1f396d885a9463e9a8 (patch) | |
tree | c7fdb5627a99bbcb9cf0c93e01bb7f33cf7f1ed3 /drivers/staging/media/atomisp/pci/atomisp_ioctl.c | |
parent | media: atomisp: Remove unused QOS defines / structure member (diff) | |
download | wireguard-linux-36c953e1efa8249fb2d85a1f396d885a9463e9a8.tar.xz wireguard-linux-36c953e1efa8249fb2d85a1f396d885a9463e9a8.zip |
media: atomisp: Flush queue on atomisp_css_start() error
I managed to trigger an atomisp_css_start() error by pushing my test system
towards an OOM situation, this triggered the following WARN_ON() in
__vb2_queue_cancel() in videobuf2-core.c:
/*
* If you see this warning, then the driver isn't cleaning up properly
* after a failed start_streaming(). See the start_streaming()
* documentation in videobuf2-core.h for more information how buffers
* should be returned to vb2 in start_streaming().
*/
if (WARN_ON(atomic_read(&q->owned_by_drv_count))) {
Fix this by calling atomisp_flush_video_pipe() to return any queued buffers
back to the videobuf2-core on an atomisp_css_start() error.
Reviewed-by: Andy Shevchenko <andy@kernel.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Diffstat (limited to 'drivers/staging/media/atomisp/pci/atomisp_ioctl.c')
-rw-r--r-- | drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/staging/media/atomisp/pci/atomisp_ioctl.c b/drivers/staging/media/atomisp/pci/atomisp_ioctl.c index 83710af7690f..43e899457b91 100644 --- a/drivers/staging/media/atomisp/pci/atomisp_ioctl.c +++ b/drivers/staging/media/atomisp/pci/atomisp_ioctl.c @@ -1353,8 +1353,10 @@ int atomisp_start_streaming(struct vb2_queue *vq, unsigned int count) asd->params.dvs_6axis = NULL; ret = atomisp_css_start(asd, css_pipe_id, false); - if (ret) + if (ret) { + atomisp_flush_video_pipe(pipe, true); goto out_unlock; + } spin_lock_irqsave(&isp->lock, irqflags); asd->streaming = ATOMISP_DEVICE_STREAMING_ENABLED; |