From patchwork Wed Jun 29 21:49:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarod Wilson X-Patchwork-Id: 7340 Return-path: Envelope-to: mchehab@pedra Delivery-date: Wed, 29 Jun 2011 18:50:41 -0300 Received: from mchehab by pedra with local (Exim 4.72) (envelope-from ) id 1Qc2eZ-0003CZ-SV for mchehab@pedra; Wed, 29 Jun 2011 18:50:38 -0300 Received: from casper.infradead.org [85.118.1.10] by pedra with IMAP (fetchmail-6.3.17) for (single-drop); Wed, 29 Jun 2011 18:50:35 -0300 (BRT) Received: from vger.kernel.org ([209.132.180.67]) by casper.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Qc2dx-0005nU-EO; Wed, 29 Jun 2011 21:49:57 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752570Ab1F2Vtz (ORCPT + 1 other); Wed, 29 Jun 2011 17:49:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48602 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751889Ab1F2Vty (ORCPT ); Wed, 29 Jun 2011 17:49:54 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p5TLneh0003089 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 29 Jun 2011 17:49:40 -0400 Received: from xavier.bos.redhat.com (xavier.bos.redhat.com [10.16.16.50]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p5TLndYK029230; Wed, 29 Jun 2011 17:49:39 -0400 From: Jarod Wilson To: linux-media@vger.kernel.org Cc: Jarod Wilson , Andy Walls , Kusanagi Kouichi Subject: [PATCH] Revert "V4L/DVB: cx23885: Enable Message Signaled Interrupts(MSI)" Date: Wed, 29 Jun 2011 17:49:33 -0400 Message-Id: <1309384173-12933-1-git-send-email-jarod@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Sender: 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. References: http://www.spinics.net/lists/linux-media/msg25956.html http://www.spinics.net/lists/linux-media/msg33676.html http://www.spinics.net/lists/linux-media/msg34734.html CC: Andy Walls CC: Kusanagi Kouichi Signed-off-by: Jarod Wilson Acked-by: Andy Walls --- drivers/media/video/cx23885/cx23885-core.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c index 64d9b21..419777a 100644 --- 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(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);