diff options
| author | Michael Krufky <mkrufky@m1k.net> | 2005-11-08 21:36:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 07:56:07 -0800 |
| commit | 7c08fb02f1a1b86292aa144cc876a95fbe2a5606 (patch) | |
| tree | 9218bb43f6b0c530af7580f8a5793c418472a0bf /drivers/media/video/bttv-driver.c | |
| parent | cc9d8d49bb13fdcea521f907e120d3a7c7ce94f8 (diff) | |
[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>
Diffstat (limited to 'drivers/media/video/bttv-driver.c')
| -rw-r--r-- | drivers/media/video/bttv-driver.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/media/video/bttv-driver.c b/drivers/media/video/bttv-driver.c index d538a994ff04..4826cf0d39d2 100644 --- 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; } |