diff options
Diffstat (limited to 'linux/drivers/media/video/bttv-cards.c')
| -rw-r--r-- | linux/drivers/media/video/bttv-cards.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/linux/drivers/media/video/bttv-cards.c b/linux/drivers/media/video/bttv-cards.c index 290d71386..bd5ddc0b0 100644 --- a/linux/drivers/media/video/bttv-cards.c +++ b/linux/drivers/media/video/bttv-cards.c @@ -4114,15 +4114,15 @@ int __devinit bttv_handle_chipset(struct bttv *btv) } -/* PXC200 muxsel helper +/* PXC200 muxsel helper * luke@syseng.anu.edu.au - * another transplant + * another transplant * from Alessandro Rubini (rubini@linux.it) * * There are 4 kinds of cards: - * PXC200L which is bt848 + * PXC200L which is bt848 * PXC200F which is bt848 with PIC controlling mux - * PXC200AL which is bt878 + * PXC200AL which is bt878 * PXC200AF which is bt878 with PIC controlling mux */ #define PX_CFG_PXC200F 0x01 @@ -4161,10 +4161,10 @@ static void PXC200_muxsel(struct bttv *btv, unsigned int input) /* mux = bttv_tvcards[btv->type].muxsel[input] & 3; */ /* ** not needed!? */ mux = input; - + /* make sure output pins are enabled */ /* bitmask=0x30f; */ - bitmask=0x302; + bitmask=0x302; /* check whether we have a PXC200A */ if (btv->cardid == PX_PXC200A_CARDID) { bitmask ^= 0x180; /* use 7 and 9, not 8 and 9 */ @@ -4173,7 +4173,7 @@ static void PXC200_muxsel(struct bttv *btv, unsigned int input) btwrite(bitmask, BT848_GPIO_OUT_EN); bitmask = btread(BT848_GPIO_DATA); - if (btv->cardid == PX_PXC200A_CARDID) + if (btv->cardid == PX_PXC200A_CARDID) bitmask = (bitmask & ~0x280) | ((mux & 2) << 8) | ((mux & 1) << 7); else /* older device */ bitmask = (bitmask & ~0x300) | ((mux & 3) << 8); @@ -4183,10 +4183,10 @@ static void PXC200_muxsel(struct bttv *btv, unsigned int input) * Was "to be safe, set the bt848 to input 0" * Actually, since it's ok at load time, better not messing * with these bits (on PXC200AF you need to set mux 2 here) - * + * * needed because bttv-driver sets mux before calling this function */ - if (btv->cardid == PX_PXC200A_CARDID) + if (btv->cardid == PX_PXC200A_CARDID) btaor(2<<5, ~BT848_IFORM_MUXSEL, BT848_IFORM); else /* older device */ btand(~BT848_IFORM_MUXSEL,BT848_IFORM); |