Skip to content

L
linux
Commit 27b350ef authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Automerge

parents 2e8a9bc4 b64b9783
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 100 additions and 124 deletions
drivers/media/video/meye.c
View file @ 27b350ef
This diff is collapsed.
drivers/media/video/meye.h
View file @ 27b350ef
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#define _MEYE_PRIV_H_ #define _MEYE_PRIV_H_
#define MEYE_DRIVER_MAJORVERSION 1 #define MEYE_DRIVER_MAJORVERSION 1
#define MEYE_DRIVER_MINORVERSION 2 #define MEYE_DRIVER_MINORVERSION 3
/****************************************************************************/ /****************************************************************************/
/* Motion JPEG chip registers */ /* Motion JPEG chip registers */
...@@ -300,7 +300,6 @@ struct meye { ...@@ -300,7 +300,6 @@ struct meye {
struct meye_grab_buffer grab_buffer[MEYE_MAX_BUFNBRS]; struct meye_grab_buffer grab_buffer[MEYE_MAX_BUFNBRS];
/* other */ /* other */
unsigned int open_count; /* open() count */
struct semaphore lock; /* semaphore for open/mmap... */ struct semaphore lock; /* semaphore for open/mmap... */
struct meye_queue grabq; /* queue for buffers to be grabbed */ struct meye_queue grabq; /* queue for buffers to be grabbed */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7