|
@@ -2060,12 +2060,8 @@ static int __devinit cx23885_initdev(struct pci_dev *pci_dev,
|
|
|
goto fail_irq;
|
|
|
}
|
|
|
|
|
|
- if (!pci_enable_msi(pci_dev))
|
|
|
- err = request_irq(pci_dev->irq, cx23885_irq,
|
|
|
- IRQF_DISABLED, dev->name, dev);
|
|
|
- else
|
|
|
- err = request_irq(pci_dev->irq, cx23885_irq,
|
|
|
- IRQF_SHARED | IRQF_DISABLED, dev->name, dev);
|
|
|
+ err = request_irq(pci_dev->irq, cx23885_irq,
|
|
|
+ IRQF_SHARED | IRQF_DISABLED, dev->name, dev);
|
|
|
if (err < 0) {
|
|
|
printk(KERN_ERR "%s: can't get IRQ %d\n",
|
|
|
dev->name, pci_dev->irq);
|
|
@@ -2114,7 +2110,6 @@ static void __devexit cx23885_finidev(struct pci_dev *pci_dev)
|
|
|
|
|
|
/* unregister stuff */
|
|
|
free_irq(pci_dev->irq, dev);
|
|
|
- pci_disable_msi(pci_dev);
|
|
|
|
|
|
cx23885_dev_unregister(dev);
|
|
|
v4l2_device_unregister(v4l2_dev);
|