From 0e9564cae54b93dbe160a295f2bba2014ec0e674 Mon Sep 17 00:00:00 2001 From: Trent Piepho Date: Wed, 28 Jan 2009 21:32:59 -0300 Subject: [PATCH] --- yaml --- r: 137899 b: refs/heads/master c: 430390e67b39ccf56d98286f5e5a72d903c9cf87 h: refs/heads/master i: 137897: 23bb4369f67ed81c6765ee1489752d91b6e6140d 137895: eeb65fae9687b38e67b6d717e786f9c5812a335f v: v3 --- [refs] | 2 +- trunk/drivers/media/video/bt8xx/bttv-cards.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f840e30ab6e6..dcffe352b8bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 13afaefc0392d377d23ce5b7e1f4f3944a00e1f1 +refs/heads/master: 430390e67b39ccf56d98286f5e5a72d903c9cf87 diff --git a/trunk/drivers/media/video/bt8xx/bttv-cards.c b/trunk/drivers/media/video/bt8xx/bttv-cards.c index df4d7752eb77..fc2b796b25fc 100644 --- a/trunk/drivers/media/video/bt8xx/bttv-cards.c +++ b/trunk/drivers/media/video/bt8xx/bttv-cards.c @@ -1799,7 +1799,7 @@ struct tvcard bttv_tvcards[] = { .tuner_addr = ADDR_UNSET, .svhs = NO_SVHS, .gpiomask = 0, - .muxsel = { 0, 1, 2, 3 }, + .muxsel = { 2, 2, 2, 2 }, .muxsel_hook = eagle_muxsel, .no_msp34xx = 1, .no_tda9875 = 1, @@ -3109,8 +3109,7 @@ static void init_ids_eagle(struct bttv *btv) * has its own multiplexer */ static void eagle_muxsel(struct bttv *btv, unsigned int input) { - btaor((2)<<5, ~(3<<5), BT848_IFORM); - gpio_bits(3,bttv_tvcards[btv->c.type].muxsel[input&7]); + gpio_bits(3, input & 3); /* composite */ /* set chroma ADC to sleep */