Skip to content

Return queued buffers on stream start failure #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
grawis wants to merge 1 commit into
base: master
Choose a base branch
from
+23 −2
Open

Return queued buffers on stream start failure #57

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 23 additions & 2 deletions videobuf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/err.h>
#include <linux/spinlock.h>
#include <linux/vmalloc.h>
#include <media/videobuf2-core.h>
Expand Down Expand Up @@ -64,15 +65,35 @@ static void vcam_out_buffer_queue(struct vb2_buffer *vb)
spin_unlock_irqrestore(&dev->out_q_slock, flags);
}

static void vcam_return_queued_buffers(struct vcam_device *dev)
{
struct vcam_out_queue *q = &dev->vcam_out_vidq;
unsigned long flags = 0;

spin_lock_irqsave(&dev->out_q_slock, flags);
while (!list_empty(&q->active)) {
struct vcam_out_buffer *buf =
list_entry(q->active.next, struct vcam_out_buffer, list);

list_del(&buf->list);
vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_QUEUED);
}
spin_unlock_irqrestore(&dev->out_q_slock, flags);
}

static int vcam_start_streaming(struct vb2_queue *q, unsigned int count)
{
struct vcam_device *dev = q->drv_priv;
int ret;

/* Try to start kernel thread */
dev->sub_thr_id = kthread_create(submitter_thread, dev, "vcam_submitter");
if (!dev->sub_thr_id) {
if (IS_ERR(dev->sub_thr_id)) {
ret = PTR_ERR(dev->sub_thr_id);
dev->sub_thr_id = NULL;
vcam_return_queued_buffers(dev);
pr_err("Failed to create kernel thread\n");
return -ECANCELED;
return ret;
}

wake_up_process(dev->sub_thr_id);
Expand Down