diff --git a/[refs] b/[refs] index 273f9cf7a9d1..a785775ff9a7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0fc0686e64d21a6abded96af2b1a895dfa8b2530 +refs/heads/master: d6964aa8d4a418d69da1652121940fabc6b5d591 diff --git a/trunk/include/media/videobuf-core.h b/trunk/include/media/videobuf-core.h index 567dfe22c07f..7aa7a7b64c1b 100644 --- a/trunk/include/media/videobuf-core.h +++ b/trunk/include/media/videobuf-core.h @@ -162,12 +162,12 @@ struct videobuf_queue { struct videobuf_queue_ops *ops; struct videobuf_qtype_ops *int_ops; + unsigned int streaming:1; + unsigned int reading:1; /* capture via mmap() + ioctl(QBUF/DQBUF) */ - unsigned int streaming; struct list_head stream; /* capture via read() */ - unsigned int reading; unsigned int read_off; struct videobuf_buffer *read_buf;