Przeglądaj źródła

[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>
Roel Kluin 17 lat temu
rodzic
commit
4df4441e41
1 zmienionych plików z 2 dodań i 2 usunięć
  1. 2 2
      arch/powerpc/kernel/isa-bridge.c

+ 2 - 2
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)
 	 *			(size depending on dev->n_addr_cells)
 	 *   cell 5:		the size of the range
 	 *   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++;
 		range++;
 		rlen -= sizeof(struct isa_range);
 		rlen -= sizeof(struct isa_range);
 		if (rlen < sizeof(struct isa_range))
 		if (rlen < sizeof(struct isa_range))
 			goto inval_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;
 		goto inval_range;
 
 
 	isa_addr = range->isa_addr.a_lo;
 	isa_addr = range->isa_addr.a_lo;