From owner-p4-projects  Wed Apr 24  7:57:18 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CB7B737B41D; Wed, 24 Apr 2002 07:57:13 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 79DC437B404
	for <perforce@freebsd.org>; Wed, 24 Apr 2002 07:57:12 -0700 (PDT)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g3OEtr032258
	for perforce@freebsd.org; Wed, 24 Apr 2002 07:55:53 -0700 (PDT)
	(envelope-from jake@freebsd.org)
Date: Wed, 24 Apr 2002 07:55:53 -0700 (PDT)
Message-Id: <200204241455.g3OEtr032258@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f
From: Jake Burkholder <jake@FreeBSD.org>
Subject: PERFORCE change 10227 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10227

Change 10227 by jake@jake_sparc64 on 2002/04/24 07:55:11

	Fix bug, || should be &&.

Affected files ...

... //depot/projects/sparc64/sys/boot/sparc64/loader/main.c#24 edit

Differences ...

==== //depot/projects/sparc64/sys/boot/sparc64/loader/main.c#24 (text+ko) ====

@@ -336,7 +336,7 @@
 		if (OF_getprop(child, "device_type", buf, sizeof(buf)) > 0 &&
 		    strcmp(buf, "cpu") == 0) {
 			if (OF_getprop(child, "upa-portid", &cpu,
-			    sizeof(cpu)) == -1 || OF_getprop(child, "portid",
+			    sizeof(cpu)) == -1 && OF_getprop(child, "portid",
 			    &cpu, sizeof(cpu)) == -1)
 				panic("main: OF_getprop");
 			if (cpu == bootcpu)

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message