---

yaml --- r: 108115 b: refs/heads/master c: abad2ec h: refs/heads/master i: 108113: bd7de85 108111: f99cd6c v: v3
git-mirror · Aug 7, 2008 · 483cf29 · 483cf29
1 parent 149e67b
commit 483cf29
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb3952bf7853667a1cb3515e67f27e67f0fce9e8
+refs/heads/master: abad2ec98f2ef357d62026cbc3989dabf33f2435
diff --git a/trunk/drivers/pci/msi.c b/trunk/drivers/pci/msi.c
@@ -308,9 +308,8 @@ static void __pci_restore_msi_state(struct pci_dev *dev)
 				  entry->msi_attrib.masked);
 
 	pci_read_config_word(dev, pos + PCI_MSI_FLAGS, &control);
-	control &= ~(PCI_MSI_FLAGS_QSIZE | PCI_MSI_FLAGS_ENABLE);
-	if (entry->msi_attrib.maskbit || !entry->msi_attrib.masked)
-		control |= PCI_MSI_FLAGS_ENABLE;
+	control &= ~PCI_MSI_FLAGS_QSIZE;
+	control |= PCI_MSI_FLAGS_ENABLE;
 	pci_write_config_word(dev, pos + PCI_MSI_FLAGS, control);
 }