From 483cf290aa2565709fb267a0c8a1305e77519152 Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Thu, 7 Aug 2008 08:52:37 -0700 Subject: [PATCH] --- yaml --- r: 108115 b: refs/heads/master c: abad2ec98f2ef357d62026cbc3989dabf33f2435 h: refs/heads/master i: 108113: bd7de85572af0e1ef9b911e87734f96c6b5625db 108111: f99cd6c97bd84ec088b1f7dd8a59b115f60c997f v: v3 --- [refs] | 2 +- trunk/drivers/pci/msi.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 75a8b0cd8a90..8bfd0f80f075 100644 --- 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 index 18354817173c..4a10b5624f72 100644 --- 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); }