diff options
Diffstat (limited to 'drivers/media/video/bw-qcam.c')
-rw-r--r-- | drivers/media/video/bw-qcam.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/video/bw-qcam.c b/drivers/media/video/bw-qcam.c index 032265383df2..b364adaae78d 100644 --- a/drivers/media/video/bw-qcam.c +++ b/drivers/media/video/bw-qcam.c | |||
@@ -523,7 +523,7 @@ static inline int qc_readbytes(struct qcam_device *q, char buffer[]) | |||
523 | int ret=1; | 523 | int ret=1; |
524 | unsigned int hi, lo; | 524 | unsigned int hi, lo; |
525 | unsigned int hi2, lo2; | 525 | unsigned int hi2, lo2; |
526 | static int state = 0; | 526 | static int state; |
527 | 527 | ||
528 | if (buffer == NULL) | 528 | if (buffer == NULL) |
529 | { | 529 | { |
@@ -898,7 +898,9 @@ static const struct file_operations qcam_fops = { | |||
898 | .open = video_exclusive_open, | 898 | .open = video_exclusive_open, |
899 | .release = video_exclusive_release, | 899 | .release = video_exclusive_release, |
900 | .ioctl = qcam_ioctl, | 900 | .ioctl = qcam_ioctl, |
901 | #ifdef CONFIG_COMPAT | ||
901 | .compat_ioctl = v4l_compat_ioctl32, | 902 | .compat_ioctl = v4l_compat_ioctl32, |
903 | #endif | ||
902 | .read = qcam_read, | 904 | .read = qcam_read, |
903 | .llseek = no_llseek, | 905 | .llseek = no_llseek, |
904 | }; | 906 | }; |
@@ -912,7 +914,7 @@ static struct video_device qcam_template= | |||
912 | 914 | ||
913 | #define MAX_CAMS 4 | 915 | #define MAX_CAMS 4 |
914 | static struct qcam_device *qcams[MAX_CAMS]; | 916 | static struct qcam_device *qcams[MAX_CAMS]; |
915 | static unsigned int num_cams = 0; | 917 | static unsigned int num_cams; |
916 | 918 | ||
917 | static int init_bwqcam(struct parport *port) | 919 | static int init_bwqcam(struct parport *port) |
918 | { | 920 | { |