From: Bjorn Helgaas <bhelgaas@google.com>
Date: Sat, 5 Apr 2014 21:14:22 +0000 (-0600)
Subject: PCI: Fix incorrect vgaarb conditional in WARN_ON()
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~38^2~9^5~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67ebd8140dc8923c65451fa0f6a8eee003c4dcd3;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed