summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--linux/drivers/media/video/bttv-cards.c4
-rw-r--r--linux/drivers/media/video/cx88/cx88-blackbird.c4
-rw-r--r--linux/drivers/media/video/cx88/cx88-cards.c4
-rw-r--r--linux/drivers/media/video/cx88/cx88-dvb.c4
-rw-r--r--linux/drivers/media/video/cx88/cx88-input.c4
-rw-r--r--linux/drivers/media/video/cx88/cx88-video.c6
-rw-r--r--linux/drivers/media/video/tveeprom.c34
-rw-r--r--v4l/mt352.c4
8 files changed, 32 insertions, 32 deletions
diff --git a/linux/drivers/media/video/bttv-cards.c b/linux/drivers/media/video/bttv-cards.c
index 48fd794e1..22059ef19 100644
--- a/linux/drivers/media/video/bttv-cards.c
+++ b/linux/drivers/media/video/bttv-cards.c
@@ -1,5 +1,5 @@
/*
- $Id: bttv-cards.c,v 1.43 2005/01/31 11:32:47 kraxel Exp $
+ $Id: bttv-cards.c,v 1.44 2005/01/31 11:35:05 kraxel Exp $
bttv-cards.c
@@ -2796,7 +2796,7 @@ void __devinit bttv_init_card2(struct bttv *btv)
if (0 == tda9887 && 0 == bttv_tvcards[btv->c.type].has_dvb &&
bttv_I2CRead(btv, I2C_TDA9887, "TDA9887") >=0)
tda9887 = 1;
- if((btv->tuner_type == TUNER_PHILIPS_FM1216ME_MK3) ||
+ if((btv->tuner_type == TUNER_PHILIPS_FM1216ME_MK3) ||
(btv->tuner_type == TUNER_PHILIPS_FM1236_MK3) ||
(btv->tuner_type == TUNER_PHILIPS_FM1256_IH3) ||
tda9887)
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
diff --git a/linux/drivers/media/video/tveeprom.c b/linux/drivers/media/video/tveeprom.c
index d4448de13..dafe12794 100644
--- a/linux/drivers/media/video/tveeprom.c
+++ b/linux/drivers/media/video/tveeprom.c
@@ -1,4 +1,4 @@
-/*
+/*
* tveeprom - eeprom decoder for tvcard configuration eeproms
*
* Data and decoding routines shamelessly borrowed from bttv-cards.c
@@ -10,7 +10,7 @@
(c) 1999-2001 Gerd Knorr <kraxel@goldbach.in-berlin.de>
* Adjustments to fit a more general model and all bugs:
-
+
Copyright (C) 2003 John Klar <linpvr at projectplasma.com>
* This program is free software; you can redistribute it and/or modify
@@ -83,12 +83,12 @@ hauppauge_tuner_fmt[] =
supplying this information. Note that many tuners where only used for
testing and never made it to the outside world. So you will only see
a subset in actual produced cards. */
-static struct HAUPPAUGE_TUNER
+static struct HAUPPAUGE_TUNER
{
int id;
char *name;
-}
-hauppauge_tuner[] =
+}
+hauppauge_tuner[] =
{
/* 0-9 */
{ TUNER_ABSENT, "None" },
@@ -143,7 +143,7 @@ hauppauge_tuner[] =
{ TUNER_ABSENT, "Philips TD1536D FH 44"},
{ TUNER_LG_NTSC_FM, "LG TP18NSR01F"},
{ TUNER_LG_PAL_FM, "LG TP18PSB01D"},
- { TUNER_LG_PAL, "LG TP18PSB11D"},
+ { TUNER_LG_PAL, "LG TP18PSB11D"},
{ TUNER_LG_PAL_I_FM, "LG TAPC-I001D"},
/* 50-59 */
{ TUNER_LG_PAL_I, "LG TAPC-I701D"},
@@ -271,7 +271,7 @@ void tveeprom_hauppauge_analog(struct tveeprom *tvee, unsigned char *eeprom_data
int i, j, len, done, tag, tuner = 0, t_format = 0;
char *t_name = NULL, *t_fmt_name = NULL;
-
+
dprintk(1, "%s\n",__FUNCTION__);
tvee->revision = done = len = 0;
for (i = 0; !done && i < 256; i += len) {
@@ -308,34 +308,34 @@ void tveeprom_hauppauge_analog(struct tveeprom *tvee, unsigned char *eeprom_data
tuner = eeprom_data[i+6];
t_format = eeprom_data[i+5];
tvee->has_radio = eeprom_data[i+len-1];
- tvee->model =
- eeprom_data[i+8] +
+ tvee->model =
+ eeprom_data[i+8] +
(eeprom_data[i+9] << 8);
tvee->revision = eeprom_data[i+10] +
(eeprom_data[i+11] << 8) +
(eeprom_data[i+12] << 16);
break;
case 0x01:
- tvee->serial_number =
- eeprom_data[i+6] +
- (eeprom_data[i+7] << 8) +
+ tvee->serial_number =
+ eeprom_data[i+6] +
+ (eeprom_data[i+7] << 8) +
(eeprom_data[i+8] << 16);
break;
case 0x02:
tvee->audio_processor = eeprom_data[i+2] & 0x0f;
break;
case 0x04:
- tvee->serial_number =
- eeprom_data[i+5] +
- (eeprom_data[i+6] << 8) +
+ tvee->serial_number =
+ eeprom_data[i+5] +
+ (eeprom_data[i+6] << 8) +
(eeprom_data[i+7] << 16);
break;
case 0x05:
tvee->audio_processor = eeprom_data[i+1] & 0x0f;
break;
case 0x06:
- tvee->model =
- eeprom_data[i+1] +
+ tvee->model =
+ eeprom_data[i+1] +
(eeprom_data[i+2] << 8);
tvee->revision = eeprom_data[i+5] +
(eeprom_data[i+6] << 8) +
diff --git a/v4l/mt352.c b/v4l/mt352.c
index 6eeb659eb..46d9587a3 100644
--- a/v4l/mt352.c
+++ b/v4l/mt352.c
@@ -68,14 +68,14 @@ static int mt352_single_write(struct dvb_frontend *fe, u8 reg, u8 val)
printk("mt352_write() to reg %x failed (err = %d)!\n", reg, err);
return err;
}
- return 0;
+ return 0;
}
int mt352_write(struct dvb_frontend* fe, u8* ibuf, int ilen)
{
int err,i;
for (i=0; i < ilen-1; i++)
- if ((err = mt352_single_write(fe,ibuf[0]+i,ibuf[i+1])))
+ if ((err = mt352_single_write(fe,ibuf[0]+i,ibuf[i+1])))
return err;
return 0;
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-04 10:29:19 +0000