diff options
| author | Roel Kluin <12o3l@tiscali.nl> | 2008-01-28 21:06:55 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-04-07 10:03:02 +1000 |
| commit | 4df4441e418c809f263939b9f371b67aca28a280 (patch) | |
| tree | abd113dbc7fd8538238f23b1d83b74b7b6e94b93 /arch | |
| parent | a07e387ae3a830106d0463ec254657f297b97ea0 (diff) | |
| download | blackbird-obmc-linux-4df4441e418c809f263939b9f371b67aca28a280.tar.gz blackbird-obmc-linux-4df4441e418c809f263939b9f371b67aca28a280.zip | |
[POWERPC] Replace logical-AND by bit-AND in pci_process_ISA_OF_ranges()
Replace logical "&&" by bit "&" for ISA_SPACE_MASK.
Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/kernel/isa-bridge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/isa-bridge.c b/arch/powerpc/kernel/isa-bridge.c index d73551da2ff1..289af348978d 100644 --- a/arch/powerpc/kernel/isa-bridge.c +++ b/arch/powerpc/kernel/isa-bridge.c @@ -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; |
