]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit - drivers/pci/pci.c
PCI: Fix incorrect vgaarb conditional in WARN_ON()
authorBjorn Helgaas <bhelgaas@google.com>
Sat, 5 Apr 2014 21:14:22 +0000 (15:14 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Fri, 25 Apr 2014 17:19:06 +0000 (11:19 -0600)
commit67ebd8140dc8923c65451fa0f6a8eee003c4dcd3
tree23c3dfa6a8a664116e33d5c74ee39e8ee96fe987
parentc1309040967e200d3ea6415ae54cf6a69d7ad996
PCI: Fix incorrect vgaarb conditional in WARN_ON()

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>
drivers/pci/pci.c