Commit 7c08fb02 authored by Michael Krufky's avatar Michael Krufky Committed by Linus Torvalds

[PATCH] v4l: 636: don t enable gpioirq until after card probe

- Don't enable gpioirq until after card probe.
Signed-off-by: default avatarMichael Krufky <mkrufky@m1k.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent cc9d8d49
......@@ -1731,10 +1731,7 @@ struct tvcard bttv_tvcards[] = {
.no_msp34xx = 1,
.no_tda9875 = 1,
.no_tda7432 = 1,
.gpiomask = 0x01,
.audiomux = { 0, 0, 0, 0, 1 },
.muxsel = { 3, 0, 1, 2},
.needs_tvaudio = 0,
.pll = PLL_28,
.no_gpioirq = 1,
.has_dvb = 1,
......@@ -2808,6 +2805,7 @@ void __devinit bttv_init_card1(struct bttv *btv)
break;
case BTTV_TWINHAN_DST:
case BTTV_AVDVBT_771:
case BTTV_PINNACLESAT:
btv->use_i2c_hw = 1;
break;
case BTTV_ADLINK_RTV24:
......@@ -2997,8 +2995,8 @@ void __devinit bttv_init_card2(struct bttv *btv)
btv->has_radio=1;
if (bttv_tvcards[btv->c.type].has_remote)
btv->has_remote=1;
if (bttv_tvcards[btv->c.type].no_gpioirq)
btv->gpioirq=0;
if (!bttv_tvcards[btv->c.type].no_gpioirq)
btv->gpioirq=1;
if (bttv_tvcards[btv->c.type].audio_hook)
btv->audio_hook=bttv_tvcards[btv->c.type].audio_hook;
......
......@@ -3893,7 +3893,6 @@ static int __devinit bttv_probe(struct pci_dev *dev,
btv->tuner_type = UNSET;
btv->pinnacle_id = UNSET;
btv->new_input = UNSET;
btv->gpioirq = 1;
btv->has_radio=radio[btv->c.nr];
/* pci stuff (init, get irq/mmio, ... */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment