From owner-svn-src-user@FreeBSD.ORG  Sun Jul  4 02:42:01 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AED671065670;
	Sun,  4 Jul 2010 02:42:01 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9E8AF8FC08;
	Sun,  4 Jul 2010 02:42:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o642g1Q6098825;
	Sun, 4 Jul 2010 02:42:01 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o642g1YH098823;
	Sun, 4 Jul 2010 02:42:01 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201007040242.o642g1YH098823@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sun, 4 Jul 2010 02:42:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209680 - user/nwhitehorn/ps3/dev/ofw
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Jul 2010 02:42:01 -0000

Author: nwhitehorn
Date: Sun Jul  4 02:42:01 2010
New Revision: 209680
URL: http://svn.freebsd.org/changeset/base/209680

Log:
  OF modules should return phandles equal to -1 on error, not 0. FDT should
  be audited for this more thoroughly, but this keeps Powermac-related
  stuff from thinking it should attach for now.

Modified:
  user/nwhitehorn/ps3/dev/ofw/ofw_fdt.c

Modified: user/nwhitehorn/ps3/dev/ofw/ofw_fdt.c
==============================================================================
--- user/nwhitehorn/ps3/dev/ofw/ofw_fdt.c	Sun Jul  4 02:40:31 2010	(r209679)
+++ user/nwhitehorn/ps3/dev/ofw/ofw_fdt.c	Sun Jul  4 02:42:01 2010	(r209680)
@@ -387,6 +387,8 @@ ofw_fdt_finddevice(ofw_t ofw, const char
 	offset = fdt_path_offset(fdtp, device);
 
 	p = (phandle_t)(uintptr_t)fdt_offset_ptr(fdtp, offset, sizeof(p));
+	if (p == 0)
+		p = -1;
 
 	return (p);
 }