diff options
author | Hans de Goede <j.w.r.degoede@hhs.nl> | 2008-07-03 05:48:22 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-20 06:16:29 -0400 |
commit | d646e701819f994c5cb1507dc859b739b5478d32 (patch) | |
tree | a9739024eb2848c4c162b590f60375d799a93467 /drivers/media/video/gspca/gspca.c | |
parent | 0c61621412ca09bd692cef86d4c9f358d5e81b0c (diff) |
V4L/DVB (8191): gspca: Make CONFIG_VIDEO_ADV_DEBUG actually work.
Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl>
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/gspca/gspca.c')
-rw-r--r-- | drivers/media/video/gspca/gspca.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c index 25e42bd7af87..b36913017d7b 100644 --- a/drivers/media/video/gspca/gspca.c +++ b/drivers/media/video/gspca/gspca.c | |||
@@ -50,7 +50,7 @@ static int video_nr = -1; | |||
50 | 50 | ||
51 | static int comp_fac = 30; /* Buffer size ratio when compressed in % */ | 51 | static int comp_fac = 30; /* Buffer size ratio when compressed in % */ |
52 | 52 | ||
53 | #ifdef VIDEO_ADV_DEBUG | 53 | #ifdef CONFIG_VIDEO_ADV_DEBUG |
54 | int gspca_debug = D_ERR | D_PROBE; | 54 | int gspca_debug = D_ERR | D_PROBE; |
55 | EXPORT_SYMBOL(gspca_debug); | 55 | EXPORT_SYMBOL(gspca_debug); |
56 | 56 | ||
@@ -817,7 +817,7 @@ static int try_fmt_vid_cap(struct gspca_dev *gspca_dev, | |||
817 | /* (luvcview problem) */ | 817 | /* (luvcview problem) */ |
818 | if (fmt->fmt.pix.pixelformat == V4L2_PIX_FMT_MJPEG) | 818 | if (fmt->fmt.pix.pixelformat == V4L2_PIX_FMT_MJPEG) |
819 | fmt->fmt.pix.pixelformat = V4L2_PIX_FMT_JPEG; | 819 | fmt->fmt.pix.pixelformat = V4L2_PIX_FMT_JPEG; |
820 | #ifdef VIDEO_ADV_DEBUG | 820 | #ifdef CONFIG_VIDEO_ADV_DEBUG |
821 | if (gspca_debug & D_CONF) | 821 | if (gspca_debug & D_CONF) |
822 | PDEBUG_MODE("try fmt cap", fmt->fmt.pix.pixelformat, w, h); | 822 | PDEBUG_MODE("try fmt cap", fmt->fmt.pix.pixelformat, w, h); |
823 | #endif | 823 | #endif |
@@ -837,7 +837,7 @@ static int try_fmt_vid_cap(struct gspca_dev *gspca_dev, | |||
837 | /* no chance, return this mode */ | 837 | /* no chance, return this mode */ |
838 | fmt->fmt.pix.pixelformat = | 838 | fmt->fmt.pix.pixelformat = |
839 | gspca_dev->cam.cam_mode[mode].pixfmt; | 839 | gspca_dev->cam.cam_mode[mode].pixfmt; |
840 | #ifdef VIDEO_ADV_DEBUG | 840 | #ifdef CONFIG_VIDEO_ADV_DEBUG |
841 | if (gspca_debug & D_CONF) { | 841 | if (gspca_debug & D_CONF) { |
842 | PDEBUG_MODE("new format", | 842 | PDEBUG_MODE("new format", |
843 | fmt->fmt.pix.pixelformat, | 843 | fmt->fmt.pix.pixelformat, |
@@ -952,7 +952,7 @@ static int dev_open(struct inode *inode, struct file *file) | |||
952 | } | 952 | } |
953 | gspca_dev->users++; | 953 | gspca_dev->users++; |
954 | file->private_data = gspca_dev; | 954 | file->private_data = gspca_dev; |
955 | #ifdef VIDEO_ADV_DEBUG | 955 | #ifdef CONFIG_VIDEO_ADV_DEBUG |
956 | /* activate the v4l2 debug */ | 956 | /* activate the v4l2 debug */ |
957 | if (gspca_debug & D_V4L2) | 957 | if (gspca_debug & D_V4L2) |
958 | gspca_dev->vdev.debug |= 3; | 958 | gspca_dev->vdev.debug |= 3; |
@@ -1225,7 +1225,7 @@ static int vidioc_streamon(struct file *file, void *priv, | |||
1225 | if (ret < 0) | 1225 | if (ret < 0) |
1226 | goto out; | 1226 | goto out; |
1227 | } | 1227 | } |
1228 | #ifdef VIDEO_ADV_DEBUG | 1228 | #ifdef CONFIG_VIDEO_ADV_DEBUG |
1229 | if (gspca_debug & D_STREAM) { | 1229 | if (gspca_debug & D_STREAM) { |
1230 | PDEBUG_MODE("stream on OK", | 1230 | PDEBUG_MODE("stream on OK", |
1231 | gspca_dev->pixfmt, | 1231 | gspca_dev->pixfmt, |
@@ -1980,7 +1980,7 @@ static void __exit gspca_exit(void) | |||
1980 | module_init(gspca_init); | 1980 | module_init(gspca_init); |
1981 | module_exit(gspca_exit); | 1981 | module_exit(gspca_exit); |
1982 | 1982 | ||
1983 | #ifdef VIDEO_ADV_DEBUG | 1983 | #ifdef CONFIG_VIDEO_ADV_DEBUG |
1984 | module_param_named(debug, gspca_debug, int, 0644); | 1984 | module_param_named(debug, gspca_debug, int, 0644); |
1985 | MODULE_PARM_DESC(debug, | 1985 | MODULE_PARM_DESC(debug, |
1986 | "Debug (bit) 0x01:error 0x02:probe 0x04:config" | 1986 | "Debug (bit) 0x01:error 0x02:probe 0x04:config" |