diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-27 14:09:24 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-27 14:09:24 -0200 |
| commit | 07c40dde6fd84df8218fed6351fe81f77458406e (patch) | |
| tree | 2d8046452992b6b68b5c6d067ee6ca4a690b39b7 /linux/drivers/media/video/cpia2 | |
| parent | 0b14b001f4b716b7d53a1413de30bbdb70764651 (diff) | |
| parent | 56ab5d5a038d60cd901d04a60c56f4a9e0631c00 (diff) | |
| download | mediapointer-dvb-s2-07c40dde6fd84df8218fed6351fe81f77458406e.tar.gz mediapointer-dvb-s2-07c40dde6fd84df8218fed6351fe81f77458406e.tar.bz2 | |
merge: http://linuxtv.org/hg/~dougsland/v4l
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cpia2')
| -rw-r--r-- | linux/drivers/media/video/cpia2/cpia2_core.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/cpia2/cpia2_usb.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/cpia2/cpia2_core.c b/linux/drivers/media/video/cpia2/cpia2_core.c index a76bd786c..a439a56c3 100644 --- a/linux/drivers/media/video/cpia2/cpia2_core.c +++ b/linux/drivers/media/video/cpia2/cpia2_core.c @@ -34,7 +34,7 @@ #include <linux/slab.h> #include <linux/vmalloc.h> -//#define _CPIA2_DEBUG_ +/* #define _CPIA2_DEBUG_ */ #include "cpia2patch.h" @@ -48,7 +48,7 @@ static const char *block_name[] = { }; #endif -static unsigned int debugs_on = 0;//DEBUG_REG; +static unsigned int debugs_on; /* default 0 - DEBUG_REG */ /****************************************************************************** diff --git a/linux/drivers/media/video/cpia2/cpia2_usb.c b/linux/drivers/media/video/cpia2/cpia2_usb.c index 87442ede0..01131e984 100644 --- a/linux/drivers/media/video/cpia2/cpia2_usb.c +++ b/linux/drivers/media/video/cpia2/cpia2_usb.c @@ -88,7 +88,7 @@ static struct usb_driver cpia2_driver = { *****************************************************************************/ static void process_frame(struct camera_data *cam) { - static int frame_count = 0; + static int frame_count; unsigned char *inbuff = cam->workbuff->data; |