| From d7515b8866b60c9526d2d7af37ebcd16c3c5ed97 Mon Sep 17 00:00:00 2001 |
| From: Jarod Wilson <jarod@redhat.com> |
| Date: Wed, 29 Jun 2011 18:36:19 -0300 |
| Subject: [media] Revert "V4L/DVB: cx23885: Enable Message Signaled Interrupts(MSI)" |
| |
| From: Jarod Wilson <jarod@redhat.com> |
| |
| commit d7515b8866b60c9526d2d7af37ebcd16c3c5ed97 upstream. |
| |
| This reverts commit e38030f3ff02684eb9e25e983a03ad318a10a2ea. |
| |
| MSI flat-out doesn't work right on cx2388x devices yet. There are now |
| multiple reports of cards that hard-lock systems when MSI is enabled, |
| including my own HVR-1250 when trying to use its built-in IR receiver. |
| Disable MSI and it works just fine. Similar for another user's HVR-1270. |
| Issues have also been reported with the HVR-1850 when MSI is enabled, |
| and the 1850 behavior sounds similar to an as-yet-undiagnosed issue I've |
| seen with an 1800. |
| |
| CC: Steven Toth <stoth@kernellabs.com> |
| CC: Kusanagi Kouichi <slash@ac.auone-net.jp> |
| Signed-off-by: Jarod Wilson <jarod@redhat.com> |
| Acked-by: Andy Walls <awalls@md.metrocast.net> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/media/video/cx23885/cx23885-core.c | 9 ++------- |
| 1 file changed, 2 insertions(+), 7 deletions(-) |
| |
| --- a/drivers/media/video/cx23885/cx23885-core.c |
| +++ b/drivers/media/video/cx23885/cx23885-core.c |
| @@ -2060,12 +2060,8 @@ static int __devinit cx23885_initdev(str |
| 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(st |
| |
| /* unregister stuff */ |
| free_irq(pci_dev->irq, dev); |
| - pci_disable_msi(pci_dev); |
| |
| cx23885_dev_unregister(dev); |
| v4l2_device_unregister(v4l2_dev); |
