diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-11 16:01:54 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-11 16:01:54 -0400 |
| commit | f2556896597c43cb48f04b1c16214938a6ccce9a (patch) | |
| tree | 9e068d92ecf2c41b7b0f36a9688c56fd5fe39709 /drivers/pci/msi.c | |
| parent | 7c13e6a3d15a4ebcc3f40df5f4d19665479f8ca3 (diff) | |
| parent | 10fec20ef5eec1c91913baec1225400f0d02df40 (diff) | |
Merge branch 'linus' into x86/defconfig
Diffstat (limited to 'drivers/pci/msi.c')
| -rw-r--r-- | drivers/pci/msi.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 18354817173c..4a10b5624f72 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c | |||
| @@ -308,9 +308,8 @@ static void __pci_restore_msi_state(struct pci_dev *dev) | |||
| 308 | entry->msi_attrib.masked); | 308 | entry->msi_attrib.masked); |
| 309 | 309 | ||
| 310 | pci_read_config_word(dev, pos + PCI_MSI_FLAGS, &control); | 310 | pci_read_config_word(dev, pos + PCI_MSI_FLAGS, &control); |
| 311 | control &= ~(PCI_MSI_FLAGS_QSIZE | PCI_MSI_FLAGS_ENABLE); | 311 | control &= ~PCI_MSI_FLAGS_QSIZE; |
| 312 | if (entry->msi_attrib.maskbit || !entry->msi_attrib.masked) | 312 | control |= PCI_MSI_FLAGS_ENABLE; |
| 313 | control |= PCI_MSI_FLAGS_ENABLE; | ||
| 314 | pci_write_config_word(dev, pos + PCI_MSI_FLAGS, control); | 313 | pci_write_config_word(dev, pos + PCI_MSI_FLAGS, control); |
| 315 | } | 314 | } |
| 316 | 315 | ||