diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-08-26 13:37:15 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-08-26 15:39:51 -0400 |
| commit | f991975a9a3ac64c9df1767b45d84e6af3944d57 (patch) | |
| tree | 3c2c9b6b74be16aa0304589c759f9a1fa59d8de0 /drivers/pci | |
| parent | e0c7cbcada84aa70709673b0d0fba0ca5d11cb01 (diff) | |
| parent | 0b8e8118dd2c9440bb7a2da1a19e15e324d3c09b (diff) | |
| download | linux-rt-f991975a9a3ac64c9df1767b45d84e6af3944d57.tar.gz | |
Merge tag 'v3.12.25' into v3.12-rt
This is the 3.12.25 stable release
Conflicts:
kernel/rtmutex.c
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/pci.c | 2 | ||||
| -rw-r--r-- | drivers/pci/quirks.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 9fc3f1f4557b..4108166ffdf4 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -4135,7 +4135,7 @@ int pci_set_vga_state(struct pci_dev *dev, bool decode, u16 cmd; int rc; - WARN_ON((flags & PCI_VGA_STATE_CHANGE_DECODES) & (command_bits & ~(PCI_COMMAND_IO|PCI_COMMAND_MEMORY))); + WARN_ON((flags & PCI_VGA_STATE_CHANGE_DECODES) && (command_bits & ~(PCI_COMMAND_IO|PCI_COMMAND_MEMORY))); /* ARCH specific VGA enables */ rc = pci_set_vga_state_arch(dev, decode, command_bits, flags); diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index f6c31fabf3af..3af18b94d0d3 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -2953,6 +2953,7 @@ static void disable_igfx_irq(struct pci_dev *dev) } DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0102, disable_igfx_irq); DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq); +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq); /* * Some devices may pass our check in pci_intx_mask_supported if |