---

yaml --- r: 282789 b: refs/heads/master c: a776c49 h: refs/heads/master i: 282787: 692ee5c v: v3
git-mirror · Dec 5, 2011 · e2c6b05 · e2c6b05
1 parent adca925
commit e2c6b05
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a424948dde8421089826e2f782d0efe9e565707e
+refs/heads/master: a776c491ca5e38c26d9f66923ff574d041e747f4
diff --git a/trunk/drivers/pci/msi.c b/trunk/drivers/pci/msi.c
@@ -981,5 +981,15 @@ EXPORT_SYMBOL(pci_msi_enabled);
 
 void pci_msi_init_pci_dev(struct pci_dev *dev)
 {
+	int pos;
 	INIT_LIST_HEAD(&dev->msi_list);
+
+	/* Disable the msi hardware to avoid screaming interrupts
+	 * during boot.  This is the power on reset default so
+	 * usually this should be a noop.
+	 */
+	pos = pci_find_capability(dev, PCI_CAP_ID_MSI);
+	if (pos)
+		msi_set_enable(dev, pos, 0);
+	msix_set_enable(dev, 0);
 }