UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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>
This commit is contained in:
Michael Krufky 2005-11-08 21:36:21 -08:00 committed by Linus Torvalds
parent cc9d8d49bb
commit 7c08fb02f1
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/media/video/bttv-cards.c
View File

@ -1731,10 +1731,7 @@ struct tvcard bttv_tvcards[] = {
.no_msp34xx = 1, .no_msp34xx = 1,
.no_tda9875 = 1, .no_tda9875 = 1,
.no_tda7432 = 1, .no_tda7432 = 1,
.gpiomask = 0x01,
.audiomux = { 0, 0, 0, 0, 1 },
.muxsel = { 3, 0, 1, 2}, .muxsel = { 3, 0, 1, 2},
.needs_tvaudio = 0,
.pll = PLL_28, .pll = PLL_28,
.no_gpioirq = 1, .no_gpioirq = 1,
.has_dvb = 1, .has_dvb = 1,
@ -2808,11 +2805,12 @@ void __devinit bttv_init_card1(struct bttv *btv)
break; break;
case BTTV_TWINHAN_DST: case BTTV_TWINHAN_DST:
case BTTV_AVDVBT_771: case BTTV_AVDVBT_771:
case BTTV_PINNACLESAT:
btv->use_i2c_hw = 1; btv->use_i2c_hw = 1;
break; break;
case BTTV_ADLINK_RTV24: case BTTV_ADLINK_RTV24:
init_RTV24( btv ); init_RTV24( btv );
break; break;
} }
if (!bttv_tvcards[btv->c.type].has_dvb) if (!bttv_tvcards[btv->c.type].has_dvb)
@ -2997,8 +2995,8 @@ void __devinit bttv_init_card2(struct bttv *btv)
btv->has_radio=1; btv->has_radio=1;
if (bttv_tvcards[btv->c.type].has_remote) if (bttv_tvcards[btv->c.type].has_remote)
btv->has_remote=1; btv->has_remote=1;
if (bttv_tvcards[btv->c.type].no_gpioirq) if (!bttv_tvcards[btv->c.type].no_gpioirq)
btv->gpioirq=0; btv->gpioirq=1;
if (bttv_tvcards[btv->c.type].audio_hook) if (bttv_tvcards[btv->c.type].audio_hook)
btv->audio_hook=bttv_tvcards[btv->c.type].audio_hook; btv->audio_hook=bttv_tvcards[btv->c.type].audio_hook;

11
drivers/media/video/bttv-driver.c
View File

@ -3889,18 +3889,17 @@ static int __devinit bttv_probe(struct pci_dev *dev,
btv->timeout.function = bttv_irq_timeout; btv->timeout.function = bttv_irq_timeout;
btv->timeout.data = (unsigned long)btv; btv->timeout.data = (unsigned long)btv;
btv->i2c_rc = -1; btv->i2c_rc = -1;
btv->tuner_type = UNSET; btv->tuner_type = UNSET;
btv->pinnacle_id = UNSET; btv->pinnacle_id = UNSET;
btv->new_input = UNSET; btv->new_input = UNSET;
btv->gpioirq = 1;
btv->has_radio=radio[btv->c.nr]; btv->has_radio=radio[btv->c.nr];
/* pci stuff (init, get irq/mmio, ... */ /* pci stuff (init, get irq/mmio, ... */
btv->c.pci = dev; btv->c.pci = dev;
btv->id = dev->device; btv->id = dev->device;
if (pci_enable_device(dev)) { 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); btv->c.nr);
return -EIO; return -EIO;
} }