]> err.no Git - linux-2.6/commitdiff
[POWERPC] Replace logical-AND by bit-AND in pci_process_ISA_OF_ranges()
authorRoel Kluin <12o3l@tiscali.nl>
Mon, 28 Jan 2008 10:06:55 +0000 (21:06 +1100)
committerPaul Mackerras <paulus@samba.org>
Mon, 7 Apr 2008 00:03:02 +0000 (10:03 +1000)
Replace logical "&&" by bit "&" for ISA_SPACE_MASK.

Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/powerpc/kernel/isa-bridge.c

index d73551da2ff199207e6469ce087403d774b5fa8b..289af348978dac142638703e630bdaf367001068 100644 (file)
@@ -80,13 +80,13 @@ static void __devinit pci_process_ISA_OF_ranges(struct device_node *isa_node,
         *                      (size depending on dev->n_addr_cells)
         *   cell 5:            the size of the range
         */
-       if ((range->isa_addr.a_hi && ISA_SPACE_MASK) != ISA_SPACE_IO) {
+       if ((range->isa_addr.a_hi & ISA_SPACE_MASK) != ISA_SPACE_IO) {
                range++;
                rlen -= sizeof(struct isa_range);
                if (rlen < sizeof(struct isa_range))
                        goto inval_range;
        }
-       if ((range->isa_addr.a_hi && ISA_SPACE_MASK) != ISA_SPACE_IO)
+       if ((range->isa_addr.a_hi & ISA_SPACE_MASK) != ISA_SPACE_IO)
                goto inval_range;
 
        isa_addr = range->isa_addr.a_lo;