Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e38030f3 authored by Kusanagi Kouichi's avatar Kusanagi Kouichi Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB: cx23885: Enable Message Signaled Interrupts(MSI) 



Signed-off-by: default avatarKusanagi Kouichi <slash@ac.auone-net.jp>
Signed-off-by: default avatarSteven Toth <stoth@kernellabs.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent b48592e4

drivers/media/video/cx23885/cx23885-core.c

+7 −2
Original line number Diff line number Diff line
@@ -1953,6 +1953,10 @@ 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);

	if (err < 0) {
@@ -2000,6 +2004,7 @@ 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);