| From 67ebd8140dc8923c65451fa0f6a8eee003c4dcd3 Mon Sep 17 00:00:00 2001 |
| From: Bjorn Helgaas <bhelgaas@google.com> |
| Date: Sat, 5 Apr 2014 15:14:22 -0600 |
| Subject: PCI: Fix incorrect vgaarb conditional in WARN_ON() |
| |
| From: Bjorn Helgaas <bhelgaas@google.com> |
| |
| commit 67ebd8140dc8923c65451fa0f6a8eee003c4dcd3 upstream. |
| |
| 3448a19da479 "vgaarb: use bridges to control VGA routing where possible" |
| added the "flags & PCI_VGA_STATE_CHANGE_DECODES" condition to an existing |
| WARN_ON(), but used bitwise AND (&) instead of logical AND (&&), so the |
| condition is never true. Replace with logical AND. |
| |
| Found by Coverity (CID 142811). |
| |
| Fixes: 3448a19da479 "vgaarb: use bridges to control VGA routing where possible" |
| Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> |
| Acked-by: Yinghai Lu <yinghai@kernel.org> |
| Acked-by: David Airlie <airlied@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/pci/pci.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/pci/pci.c |
| +++ b/drivers/pci/pci.c |
| @@ -4102,7 +4102,7 @@ int pci_set_vga_state(struct pci_dev *de |
| 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); |
