From owner-svn-src-all@FreeBSD.ORG  Fri Oct 25 15:37:58 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id CEB14E15;
 Fri, 25 Oct 2013 15:37:58 +0000 (UTC)
 (envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id BC1A82E54;
 Fri, 25 Oct 2013 15:37:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9PFbwpr016255;
 Fri, 25 Oct 2013 15:37:58 GMT
 (envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9PFbwe3016254;
 Fri, 25 Oct 2013 15:37:58 GMT
 (envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201310251537.r9PFbwe3016254@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Fri, 25 Oct 2013 15:37:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r257118 - head/sys/dev/ofw
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Oct 2013 15:37:58 -0000

Author: nwhitehorn
Date: Fri Oct 25 15:37:58 2013
New Revision: 257118
URL: http://svnweb.freebsd.org/changeset/base/257118

Log:
  Make sure to get the right node when looking up #interrupt-cells.

Modified:
  head/sys/dev/ofw/ofw_nexus.c

Modified: head/sys/dev/ofw/ofw_nexus.c
==============================================================================
--- head/sys/dev/ofw/ofw_nexus.c	Fri Oct 25 14:43:16 2013	(r257117)
+++ head/sys/dev/ofw/ofw_nexus.c	Fri Oct 25 15:37:58 2013	(r257118)
@@ -464,8 +464,8 @@ nexus_setup_dinfo(device_t dev, phandle_
 		iparent = 0;
 		OF_searchencprop(node, "interrupt-parent", &iparent,
 		    sizeof(iparent));
-		OF_searchencprop(iparent, "#interrupt-cells", &icells,
-		    sizeof(icells));
+		OF_searchencprop(OF_xref_phandle(iparent), "#interrupt-cells",
+		    &icells, sizeof(icells));
 		for (i = 0; i < nintr; i+= icells) {
 			intr[i] = ofw_bus_map_intr(dev, iparent, intr[i]);
 			resource_list_add(&ndi->ndi_rl, SYS_RES_IRQ, i, intr[i],