diff options
author | Roel Kluin <12o3l@tiscali.nl> | 2008-01-28 05:06:55 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-04-06 20:03:02 -0400 |
commit | 4df4441e418c809f263939b9f371b67aca28a280 (patch) | |
tree | abd113dbc7fd8538238f23b1d83b74b7b6e94b93 /arch/powerpc/kernel | |
parent | a07e387ae3a830106d0463ec254657f297b97ea0 (diff) |
[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/powerpc/kernel')
-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, | |||
80 | * (size depending on dev->n_addr_cells) | 80 | * (size depending on dev->n_addr_cells) |
81 | * cell 5: the size of the range | 81 | * cell 5: the size of the range |
82 | */ | 82 | */ |
83 | if ((range->isa_addr.a_hi && ISA_SPACE_MASK) != ISA_SPACE_IO) { | 83 | if ((range->isa_addr.a_hi & ISA_SPACE_MASK) != ISA_SPACE_IO) { |
84 | range++; | 84 | range++; |
85 | rlen -= sizeof(struct isa_range); | 85 | rlen -= sizeof(struct isa_range); |
86 | if (rlen < sizeof(struct isa_range)) | 86 | if (rlen < sizeof(struct isa_range)) |
87 | goto inval_range; | 87 | goto inval_range; |
88 | } | 88 | } |
89 | if ((range->isa_addr.a_hi && ISA_SPACE_MASK) != ISA_SPACE_IO) | 89 | if ((range->isa_addr.a_hi & ISA_SPACE_MASK) != ISA_SPACE_IO) |
90 | goto inval_range; | 90 | goto inval_range; |
91 | 91 | ||
92 | isa_addr = range->isa_addr.a_lo; | 92 | isa_addr = range->isa_addr.a_lo; |