Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 74833
b: refs/heads/master
c: 02ec96b
h: refs/heads/master
i:
  74831: da5fef8
v: v3
  • Loading branch information
Linus Torvalds committed Dec 12, 2007
1 parent a44f65c commit c63401d
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 187426e69afe0a2ad697c9c5f5f654254da0e3a0
refs/heads/master: 02ec96be2b45d9f2712687ad107038ef390b24c2
14 changes: 13 additions & 1 deletion trunk/drivers/media/video/videobuf-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -806,7 +806,7 @@ ssize_t videobuf_read_one(struct videobuf_queue *q,
}

/* Locking: Caller holds q->lock */
int videobuf_read_start(struct videobuf_queue *q)
int __videobuf_read_start(struct videobuf_queue *q)
{
enum v4l2_field field;
unsigned long flags=0;
Expand Down Expand Up @@ -862,6 +862,17 @@ static void __videobuf_read_stop(struct videobuf_queue *q)

}

int videobuf_read_start(struct videobuf_queue *q)
{
int rc;

mutex_lock(&q->lock);
rc = __videobuf_read_start(q);
mutex_unlock(&q->lock);

return rc;
}

void videobuf_read_stop(struct videobuf_queue *q)
{
mutex_lock(&q->lock);
Expand Down Expand Up @@ -1058,6 +1069,7 @@ EXPORT_SYMBOL_GPL(videobuf_dqbuf);
EXPORT_SYMBOL_GPL(videobuf_streamon);
EXPORT_SYMBOL_GPL(videobuf_streamoff);

EXPORT_SYMBOL_GPL(videobuf_read_start);
EXPORT_SYMBOL_GPL(videobuf_read_stop);
EXPORT_SYMBOL_GPL(videobuf_stop);
EXPORT_SYMBOL_GPL(videobuf_read_stream);
Expand Down

0 comments on commit c63401d

Please sign in to comment.