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

- Don't enable gpioirq until after card probe.

Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/media/video/bttv-cards.c b/drivers/media/video/bttv-cards.c
index 75033f06551f163fdcf69d8024ce58328cb608d2..e872cd47a64808c9bd8dd8fa984696b0ba455ded 100644 (file)
--- a/drivers/media/video/bttv-cards.c
+++ b/drivers/media/video/bttv-cards.c
@@ -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,11 +2805,12 @@ 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:
-                init_RTV24( btv );
-                break;
+       case BTTV_ADLINK_RTV24:
+               init_RTV24( btv );
+               break;
 
        }
        if (!bttv_tvcards[btv->c.type].has_dvb)
@@ -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;
 

diff --git a/drivers/media/video/bttv-driver.c b/drivers/media/video/bttv-driver.c
index d538a994ff04da1d68bcfe9ddc5023671c53d1a8..4826cf0d39d2191d0ec6fe07609deb6b34bf4818 100644 (file)
--- a/drivers/media/video/bttv-driver.c
+++ b/drivers/media/video/bttv-driver.c
@@ -3889,18 +3889,17 @@ static int __devinit bttv_probe(struct pci_dev *dev,
        btv->timeout.function = bttv_irq_timeout;
        btv->timeout.data     = (unsigned long)btv;
 
-        btv->i2c_rc = -1;
-        btv->tuner_type  = UNSET;
-        btv->pinnacle_id = UNSET;
+       btv->i2c_rc = -1;
+       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, ... */
        btv->c.pci = dev;
-        btv->id  = dev->device;
+       btv->id  = dev->device;
        if (pci_enable_device(dev)) {
-                printk(KERN_WARNING "bttv%d: Can't enable device.\n",
+               printk(KERN_WARNING "bttv%d: Can't enable device.\n",
                       btv->c.nr);
                return -EIO;
        }