2010/12/16 Mark Marshall <mark.marshall at csr.com>: > On 16/12/2010 05:54, Dave Airlie wrote: >> >> From: Dave Airlie<airlied at redhat.com> >> ?int pci_set_vga_state(struct pci_dev *dev, bool decode, >> - ? ? ? ? ? ? ? ? ? ? unsigned int command_bits, bool change_bridge) >> + ? ? ? ? ? ? ? ? ? ? unsigned int command_bits, u32 flags) >> ?{ >> ? ? ? ?struct pci_bus *bus; >> ? ? ? ?struct pci_dev *bridge; >> ? ? ? ?u16 cmd; >> ? ? ? ?int rc; >> >> - ? ? ? WARN_ON(command_bits& ?~(PCI_COMMAND_IO|PCI_COMMAND_MEMORY)); >> + ? ? ? WARN_ON((flags& ?PCI_VGA_STATE_CHANGE_DECODES)& ?(command_bits& >> ?~(PCI_COMMAND_IO|PCI_COMMAND_MEMORY))); > > Minor thing, but I think the middle & should be a &&?
Dave: as you are going to fix patch, please add spaces around "|" by the way: PCI_COMMAND_IO|PCI_COMMAND_MEMORY -- Rafa?