Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4df4441e authored by Roel Kluin's avatar Roel Kluin Committed by Paul Mackerras
Browse files

[POWERPC] Replace logical-AND by bit-AND in pci_process_ISA_OF_ranges() 



Replace logical "&&" by bit "&" for ISA_SPACE_MASK.

Signed-off-by: default avatarRoel Kluin <12o3l@tiscali.nl>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent a07e387a

arch/powerpc/kernel/isa-bridge.c

+2 −2
Original line number Diff line number Diff line
@@ -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;