diff options
| author | Nickolay V. Shmyrev <devnull@localhost> | 2005-09-14 23:42:53 +0000 |
|---|---|---|
| committer | Nickolay V. Shmyrev <devnull@localhost> | 2005-09-14 23:42:53 +0000 |
| commit | e187feaa589fab0fa05d1d8ecf062935aa6a9072 (patch) | |
| tree | 1256261d38b49e87db62baa880e2e83bea37e914 /linux/drivers/media/video | |
| parent | b8d42df0f3a0c156938a6859101e697f30169055 (diff) | |
| download | mediapointer-dvb-s2-e187feaa589fab0fa05d1d8ecf062935aa6a9072.tar.gz mediapointer-dvb-s2-e187feaa589fab0fa05d1d8ecf062935aa6a9072.tar.bz2 | |
* cx88-core.c:
- Remove some #if 0 which doesn't have any sense
Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-video.c | 17 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-video.c | 6 |
2 files changed, 5 insertions, 18 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c index a0a60433d..5bbea7789 100644 --- a/linux/drivers/media/video/cx88/cx88-video.c +++ b/linux/drivers/media/video/cx88/cx88-video.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-video.c,v 1.93 2005/09/11 04:58:14 mkrufky Exp $ + * $Id: cx88-video.c,v 1.94 2005/09/14 23:42:53 nsh Exp $ * * device driver for Conexant 2388x based TV cards * video4linux video interface @@ -1368,9 +1368,6 @@ static int video_do_ioctl(struct inode *inode, struct file *file, struct cx8800_fh *fh = file->private_data; struct cx8800_dev *dev = fh->dev; struct cx88_core *core = dev->core; -#if 0 - unsigned long flags; -#endif int err; if (video_debug > 1) @@ -1508,18 +1505,11 @@ static int video_do_ioctl(struct inode *inode, struct file *file, int cx88_do_ioctl(struct inode *inode, struct file *file, int radio, struct cx88_core *core, unsigned int cmd, void *arg, v4l2_kioctl driver_ioctl) { -#if 0 - unsigned long flags; -#endif int err; + dprintk( 1, "CORE IOCTL: 0x%x\n", cmd ); if (video_debug > 1) cx88_print_ioctl(core->name,cmd); -#if 0 - printk( KERN_INFO "CORE IOCTL: 0x%x\n", cmd ); - cx88_print_ioctl(core->name,cmd); -#endif - dprintk( 1, "CORE IOCTL: 0x%x\n", cmd ); switch (cmd) { /* ---------- tv norms ---------- */ @@ -2096,9 +2086,6 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev, { struct cx8800_dev *dev; struct cx88_core *core; -#if 0 - struct tuner_setup tun_setup; -#endif int err; dev = kmalloc(sizeof(*dev),GFP_KERNEL); diff --git a/linux/drivers/media/video/saa7134/saa7134-video.c b/linux/drivers/media/video/saa7134/saa7134-video.c index 0146b1c4b..16f18cf4c 100644 --- a/linux/drivers/media/video/saa7134/saa7134-video.c +++ b/linux/drivers/media/video/saa7134/saa7134-video.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-video.c,v 1.40 2005/09/14 18:38:33 nsh Exp $ + * $Id: saa7134-video.c,v 1.41 2005/09/14 23:42:53 nsh Exp $ * * device driver for philips saa7134 based TV cards * video4linux video interface @@ -1807,9 +1807,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; |