Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 183 → Rev 184

/shark/trunk/drivers/bttv/bttv-driver.c
1135,7 → 1135,7
btv->risc_cap_even = 0;
bt848_set_risc_jmps(btv,-1);
 
handler_remove(btv->dev->irq);
//handler_remove(btv->dev->irq);
/*
* A word of warning. At this point the chip
1144,7 → 1144,7
* operations.
*/
tmp = btread(BT848_I2C); /* This fixes the PCI posting delay */
//tmp = btread(BT848_I2C); /* This fixes the PCI posting delay */
 
pci_write_config_dword(btv->dev,PCI_COMMAND,oldpci_command);
 
2091,12 → 2091,7
btv->dev = vmalloc_32(sizeof(struct pci_dev));
 
/* Scan the devices connected to the PCI bus */
if (pci_init() == 1) {
clear();
pci_show();
} else {
return -1;
}
if (pci_init() != 1) return -1;
 
bttv_num = 0;