diff options
Diffstat (limited to 'linux/drivers/media/video/cx88')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-blackbird.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-cards.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-dvb.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-input.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-video.c | 6 |
5 files changed, 11 insertions, 11 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-blackbird.c b/linux/drivers/media/video/cx88/cx88-blackbird.c index f70fdf4d4..e66467e7d 100644 --- a/linux/drivers/media/video/cx88/cx88-blackbird.c +++ b/linux/drivers/media/video/cx88/cx88-blackbird.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-blackbird.c,v 1.23 2004/12/10 12:33:39 kraxel Exp $ + * $Id: cx88-blackbird.c,v 1.24 2005/01/31 11:35:05 kraxel Exp $ * * Support for a cx23416 mpeg encoder via cx2388x host port. * "blackbird" reference design. @@ -695,7 +695,7 @@ static int mpeg_open(struct inode *inode, struct file *file) /* FIXME: locking against other video device */ cx88_set_scale(dev->core, dev->width, dev->height, V4L2_FIELD_INTERLACED); - + videobuf_queue_init(&fh->mpegq, &blackbird_qops, dev->pci, &dev->slock, V4L2_BUF_TYPE_VIDEO_CAPTURE, diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c index be82751dc..e44e43ab2 100644 --- a/linux/drivers/media/video/cx88/cx88-cards.c +++ b/linux/drivers/media/video/cx88/cx88-cards.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-cards.c,v 1.57 2005/01/24 17:37:23 kraxel Exp $ + * $Id: cx88-cards.c,v 1.58 2005/01/31 11:35:05 kraxel Exp $ * * device driver for Conexant 2388x based TV cards * card-specific stuff. @@ -656,7 +656,7 @@ static int hauppauge_eeprom_dvb(struct cx88_core *core, u8 *ee) return -ENODEV; } printk(KERN_INFO "%s: hauppauge eeprom: model=%d, tuner=%d (%s)\n", - core->name, model, tuner, + core->name, model, tuner, core->pll_desc ? core->pll_desc->name : "UNKNOWN"); core->pll_addr = 0x61; diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c index 4a6aa6b86..f8599922b 100644 --- a/linux/drivers/media/video/cx88/cx88-dvb.c +++ b/linux/drivers/media/video/cx88/cx88-dvb.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-dvb.c,v 1.22 2005/01/03 17:56:58 kraxel Exp $ + * $Id: cx88-dvb.c,v 1.23 2005/01/31 11:35:05 kraxel Exp $ * * device driver for Conexant 2388x based TV cards * MPEG Transport Stream (DVB) routines @@ -120,7 +120,7 @@ static int dntv_live_dvbt_demod_init(struct dvb_frontend* fe) 0x00, 0xFF, 0x00, 0x40, 0x40 }; static u8 dntv_extra[] = { 0xB5, 0x7A }; static u8 capt_range_cfg[] = { 0x75, 0x32 }; - + mt352_write(fe, clock_config, sizeof(clock_config)); udelay(2000); mt352_write(fe, reset, sizeof(reset)); diff --git a/linux/drivers/media/video/cx88/cx88-input.c b/linux/drivers/media/video/cx88/cx88-input.c index 3b02065d7..0570cebe8 100644 --- a/linux/drivers/media/video/cx88/cx88-input.c +++ b/linux/drivers/media/video/cx88/cx88-input.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-input.c,v 1.4 2005/01/07 13:58:49 kraxel Exp $ + * $Id: cx88-input.c,v 1.5 2005/01/31 11:35:05 kraxel Exp $ * * Device driver for GPIO attached remote control interfaces * on Conexant 2388x based TV/DVB cards. @@ -85,7 +85,7 @@ static IR_KEYTAB_TYPE ir_codes_hauppauge_new[IR_KEYTAB_SIZE] = { [ 0x07 ] = KEY_KP7, // 7 [ 0x08 ] = KEY_KP8, // 8 [ 0x09 ] = KEY_KP9, // 9 - [ 0x0b ] = KEY_RED, // red button + [ 0x0b ] = KEY_RED, // red button [ 0x0c ] = KEY_OPTION, // black key without text [ 0x0d ] = KEY_MENU, // menu [ 0x0f ] = KEY_MUTE, // mute diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c index 6b6d0cb25..9a0653b5b 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.53 2005/01/20 12:54:46 kraxel Exp $ + * $Id: cx88-video.c,v 1.54 2005/01/31 11:35:05 kraxel Exp $ * * device driver for Conexant 2388x based TV cards * video4linux video interface @@ -1439,7 +1439,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file, if (*i >= 4) return -EINVAL; down(&dev->lock); - dev->core->audiomode = UNSET; + dev->core->audiomode = UNSET; video_mux(dev,*i); up(&dev->lock); return 0; @@ -1601,7 +1601,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file, return -EINVAL; down(&dev->lock); dev->freq = f->frequency; - dev->core->audiomode = UNSET; + dev->core->audiomode = UNSET; #ifdef V4L2_I2C_CLIENTS cx88_call_i2c_clients(dev->core,VIDIOC_S_FREQUENCY,f); #else |