[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>

diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index a29c12754ef6cc91d20f3f66793162341e9e4806..4c99fc39bb2a2933217431e948f9bff33f52f581 100644 (file)
--- 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,
 {
        int err;
 
+       dprintk( 1, "CORE IOCTL: 0x%x\n", cmd );
        if (video_debug > 1)
                cx88_print_ioctl(core->name,cmd);
-       dprintk( 1, "CORE IOCTL: 0x%x\n", cmd );
 
        switch (cmd) {
        /* ---------- tv norms ---------- */

diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index d395403afe5ad8a0a767c43b3425ae932e901323..cd1f70fffdec6f3b49e73d54c888efbff70d1406 100644 (file)
--- 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,
                        crop->c.height = b->top - crop->c.top + b->height;
 
                if (crop->c.left < b->left)
-                       crop->c.top = b->left;
+                       crop->c.left = b->left;
                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)
                        crop->c.width = b->left - crop->c.left + b->width;