aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/bt8xx/bttv-cards.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/bt8xx/bttv-cards.c')
-rw-r--r--drivers/media/video/bt8xx/bttv-cards.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c
index 1f4f2625395e..900d18e14060 100644
--- a/drivers/media/video/bt8xx/bttv-cards.c
+++ b/drivers/media/video/bt8xx/bttv-cards.c
@@ -3275,15 +3275,15 @@ static void eagle_muxsel(struct bttv *btv, unsigned int input)
3275 btaor((2)<<5, ~(3<<5), BT848_IFORM); 3275 btaor((2)<<5, ~(3<<5), BT848_IFORM);
3276 gpio_bits(3,bttv_tvcards[btv->c.type].muxsel[input&7]); 3276 gpio_bits(3,bttv_tvcards[btv->c.type].muxsel[input&7]);
3277 3277
3278 /* composite */ 3278 /* composite */
3279 /* set chroma ADC to sleep */ 3279 /* set chroma ADC to sleep */
3280 btor(BT848_ADC_C_SLEEP, BT848_ADC); 3280 btor(BT848_ADC_C_SLEEP, BT848_ADC);
3281 /* set to composite video */ 3281 /* set to composite video */
3282 btand(~BT848_CONTROL_COMP, BT848_E_CONTROL); 3282 btand(~BT848_CONTROL_COMP, BT848_E_CONTROL);
3283 btand(~BT848_CONTROL_COMP, BT848_O_CONTROL); 3283 btand(~BT848_CONTROL_COMP, BT848_O_CONTROL);
3284 3284
3285 /* switch sync drive off */ 3285 /* switch sync drive off */
3286 gpio_bits(LM1882_SYNC_DRIVE,LM1882_SYNC_DRIVE); 3286 gpio_bits(LM1882_SYNC_DRIVE,LM1882_SYNC_DRIVE);
3287} 3287}
3288 3288
3289static void gvc1100_muxsel(struct bttv *btv, unsigned int input) 3289static void gvc1100_muxsel(struct bttv *btv, unsigned int input)
@@ -3452,7 +3452,7 @@ void __devinit bttv_init_card2(struct bttv *btv)
3452 printk("bttv%d: radio detected by subsystem id (CPH05x)\n",btv->c.nr); 3452 printk("bttv%d: radio detected by subsystem id (CPH05x)\n",btv->c.nr);
3453 } 3453 }
3454 break; 3454 break;
3455 case BTTV_BOARD_STB2: 3455 case BTTV_BOARD_STB2:
3456 if (btv->cardid == 0x3060121a) { 3456 if (btv->cardid == 0x3060121a) {
3457 /* Fix up entry for 3DFX VoodooTV 100, 3457 /* Fix up entry for 3DFX VoodooTV 100,
3458 which is an OEM STB card variant. */ 3458 which is an OEM STB card variant. */
@@ -3783,7 +3783,7 @@ static void __devinit osprey_eeprom(struct bttv *btv, const u8 ee[256])
3783 for (i = 12; i < 21; i++) 3783 for (i = 12; i < 21; i++)
3784 serial *= 10, serial += ee[i] - '0'; 3784 serial *= 10, serial += ee[i] - '0';
3785 } 3785 }
3786 } else { 3786 } else {
3787 unsigned short type; 3787 unsigned short type;
3788 3788
3789 for (i = 4*16; i < 8*16; i += 16) { 3789 for (i = 4*16; i < 8*16; i += 16) {