---

yaml --- r: 199934 b: refs/heads/master c: 478b3a4 h: refs/heads/master v: v3
git-mirror · Jun 1, 2010 · 3cfe669 · 3cfe669
1 parent e796b7f
commit 3cfe669
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a2a1848a7d744a437f96b79a655c13b8090e74d
+refs/heads/master: 478b3a42bdcd8d1cb57c91cabdc8b6164c639e42
diff --git a/trunk/drivers/media/dvb/ngene/ngene-core.c b/trunk/drivers/media/dvb/ngene/ngene-core.c
@@ -1300,8 +1300,10 @@ static void ngene_stop(struct ngene *dev)
 	ngwritel(0, NGENE_EVENT);
 	ngwritel(0, NGENE_EVENT_HI);
 	free_irq(dev->pci_dev->irq, dev);
+#ifdef CONFIG_PCI_MSI
 	if (dev->msi_enabled)
 		pci_disable_msi(dev->pci_dev);
+#endif
 }
 
 static int ngene_start(struct ngene *dev)
@@ -1339,7 +1341,7 @@ static int ngene_start(struct ngene *dev)
 
 #ifdef CONFIG_PCI_MSI
 	/* enable MSI if kernel and card support it */
-	if (dev->card_info->msi_supported) {
+	if (pci_msi_enabled() && dev->card_info->msi_supported) {
 		ngwritel(0, NGENE_INT_ENABLE);
 		free_irq(dev->pci_dev->irq, dev);
 		stat = pci_enable_msi(dev->pci_dev);
@@ -1391,9 +1393,11 @@ static int ngene_start(struct ngene *dev)
 fail:
 	ngwritel(0, NGENE_INT_ENABLE);
 	free_irq(dev->pci_dev->irq, dev);
+#ifdef CONFIG_PCI_MSI
 fail2:
 	if (dev->msi_enabled)
 		pci_disable_msi(dev->pci_dev);
+#endif
 	return stat;
 }