Browse Source

[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>
Nickolay V. Shmyrev 19 years ago
parent
commit
9f95a0bf85

+ 1 - 1
drivers/media/video/cx88/cx88-video.c

@@ -1256,9 +1256,9 @@ int cx88_do_ioctl(struct inode *inode, struct file *file, int radio,
 {
 {
 	int err;
 	int err;
 
 
+	dprintk( 1, "CORE IOCTL: 0x%x\n", cmd );
 	if (video_debug > 1)
 	if (video_debug > 1)
 		cx88_print_ioctl(core->name,cmd);
 		cx88_print_ioctl(core->name,cmd);
-	dprintk( 1, "CORE IOCTL: 0x%x\n", cmd );
 
 
 	switch (cmd) {
 	switch (cmd) {
 	/* ---------- tv norms ---------- */
 	/* ---------- tv norms ---------- */

+ 2 - 2
drivers/media/video/saa7134/saa7134-video.c

@@ -1798,9 +1798,9 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
 			crop->c.height = b->top - crop->c.top + b->height;
 			crop->c.height = b->top - crop->c.top + b->height;
 
 
 		if (crop->c.left < b->left)
 		if (crop->c.left < b->left)
-			crop->c.top = b->left;
+			crop->c.left = b->left;
 		if (crop->c.left > b->left + b->width)
 		if (crop->c.left > b->left + b->width)
-			crop->c.top = b->left + b->width;
+			crop->c.left = b->left + b->width;
 		if (crop->c.width > b->left - crop->c.left + b->width)
 		if (crop->c.width > b->left - crop->c.left + b->width)
 			crop->c.width = b->left - crop->c.left + b->width;
 			crop->c.width = b->left - crop->c.left + b->width;