Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 21743
b: refs/heads/master
c: 9b89f2d
h: refs/heads/master
i:
  21741: e7a98f3
  21739: 809b5f1
  21735: 0672ef8
  21727: 35d4433
v: v3
  • Loading branch information
Mauro Carvalho Chehab authored and Linus Torvalds committed Mar 21, 2006
1 parent a45f201 commit 27c86b6
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 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: f89982a978974cc2fb74f512d7ec7438e0e851ea
refs/heads/master: 9b89f2d301db6ad1fc716b70d9e26a38c958e7a5
14 changes: 7 additions & 7 deletions trunk/drivers/media/video/video-buf.c
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ videobuf_queue_is_busy(struct videobuf_queue *q)
void
videobuf_queue_cancel(struct videobuf_queue *q)
{
unsigned long flags;
unsigned long flags=0;
int i;

/* remove queued buffers from list */
Expand Down Expand Up @@ -588,7 +588,7 @@ videobuf_qbuf(struct videobuf_queue *q,
{
struct videobuf_buffer *buf;
enum v4l2_field field;
unsigned long flags;
unsigned long flags=0;
int retval;

mutex_lock(&q->lock);
Expand Down Expand Up @@ -700,7 +700,7 @@ int videobuf_streamon(struct videobuf_queue *q)
{
struct videobuf_buffer *buf;
struct list_head *list;
unsigned long flags;
unsigned long flags=0;
int retval;

mutex_lock(&q->lock);
Expand Down Expand Up @@ -745,7 +745,7 @@ videobuf_read_zerocopy(struct videobuf_queue *q, char __user *data,
size_t count, loff_t *ppos)
{
enum v4l2_field field;
unsigned long flags;
unsigned long flags=0;
int retval;

/* setup stuff */
Expand Down Expand Up @@ -787,7 +787,7 @@ ssize_t videobuf_read_one(struct videobuf_queue *q,
int nonblocking)
{
enum v4l2_field field;
unsigned long flags;
unsigned long flags=0;
unsigned size, nbufs, bytes;
int retval;

Expand Down Expand Up @@ -866,7 +866,7 @@ ssize_t videobuf_read_one(struct videobuf_queue *q,
int videobuf_read_start(struct videobuf_queue *q)
{
enum v4l2_field field;
unsigned long flags;
unsigned long flags=0;
int count = 0, size = 0;
int err, i;

Expand Down Expand Up @@ -918,7 +918,7 @@ ssize_t videobuf_read_stream(struct videobuf_queue *q,
{
unsigned int *fc, bytes;
int err, retval;
unsigned long flags;
unsigned long flags=0;

dprintk(2,"%s\n",__FUNCTION__);
mutex_lock(&q->lock);
Expand Down

0 comments on commit 27c86b6

Please sign in to comment.