diff options
author | Nickolay V. Shmyrev <nshmyrev@yandex.ru> | 2005-11-09 00:36:37 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 10:56:10 -0500 |
commit | 9f95a0bf8594f59c708492d5ab6ea9a72621f0dd (patch) | |
tree | 046fb4018205a7b78d6875de2649d92164dd95c3 /drivers/media | |
parent | 17a05ef33a3c9489f659c4e40f8bfafd834e0cb9 (diff) |
[PATCH] v4l: 667: remove some if 0 which doesn t have any sense
- Remove some #if 0 which doesn't have any sense
Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/cx88/cx88-video.c | 2 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-video.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c index a29c12754ef6..4c99fc39bb2a 100644 --- a/drivers/media/video/cx88/cx88-video.c +++ b/drivers/media/video/cx88/cx88-video.c | |||
@@ -1256,9 +1256,9 @@ int cx88_do_ioctl(struct inode *inode, struct file *file, int radio, | |||
1256 | { | 1256 | { |
1257 | int err; | 1257 | int err; |
1258 | 1258 | ||
1259 | dprintk( 1, "CORE IOCTL: 0x%x\n", cmd ); | ||
1259 | if (video_debug > 1) | 1260 | if (video_debug > 1) |
1260 | cx88_print_ioctl(core->name,cmd); | 1261 | cx88_print_ioctl(core->name,cmd); |
1261 | dprintk( 1, "CORE IOCTL: 0x%x\n", cmd ); | ||
1262 | 1262 | ||
1263 | switch (cmd) { | 1263 | switch (cmd) { |
1264 | /* ---------- tv norms ---------- */ | 1264 | /* ---------- tv norms ---------- */ |
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c index d395403afe5a..cd1f70fffdec 100644 --- a/drivers/media/video/saa7134/saa7134-video.c +++ b/drivers/media/video/saa7134/saa7134-video.c | |||
@@ -1798,9 +1798,9 @@ static int video_do_ioctl(struct inode *inode, struct file *file, | |||
1798 | crop->c.height = b->top - crop->c.top + b->height; | 1798 | crop->c.height = b->top - crop->c.top + b->height; |
1799 | 1799 | ||
1800 | if (crop->c.left < b->left) | 1800 | if (crop->c.left < b->left) |
1801 | crop->c.top = b->left; | 1801 | crop->c.left = b->left; |
1802 | if (crop->c.left > b->left + b->width) | 1802 | if (crop->c.left > b->left + b->width) |
1803 | crop->c.top = b->left + b->width; | 1803 | crop->c.left = b->left + b->width; |
1804 | if (crop->c.width > b->left - crop->c.left + b->width) | 1804 | if (crop->c.width > b->left - crop->c.left + b->width) |
1805 | crop->c.width = b->left - crop->c.left + b->width; | 1805 | crop->c.width = b->left - crop->c.left + b->width; |
1806 | 1806 | ||