From owner-svn-src-head@FreeBSD.ORG  Wed Oct 10 00:06:32 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 50549C9F;
 Wed, 10 Oct 2012 00:06:32 +0000 (UTC)
 (envelope-from neel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 391C78FC0A;
 Wed, 10 Oct 2012 00:06:32 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9A06WRI013348;
 Wed, 10 Oct 2012 00:06:32 GMT (envelope-from neel@svn.freebsd.org)
Received: (from neel@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9A06Wxt013346;
 Wed, 10 Oct 2012 00:06:32 GMT (envelope-from neel@svn.freebsd.org)
Message-Id: <201210100006.q9A06Wxt013346@svn.freebsd.org>
From: Neel Natu <neel@FreeBSD.org>
Date: Wed, 10 Oct 2012 00:06:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r241386 - head/sys/dev/acpica
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Oct 2012 00:06:32 -0000

Author: neel
Date: Wed Oct 10 00:06:31 2012
New Revision: 241386
URL: http://svn.freebsd.org/changeset/base/241386

Log:
  Grab the softc from the ACPI host-pci bridge device instead of from the pci
  endpoint device.
  
  Reviewed by:	jhb

Modified:
  head/sys/dev/acpica/acpi_pcib_acpi.c

Modified: head/sys/dev/acpica/acpi_pcib_acpi.c
==============================================================================
--- head/sys/dev/acpica/acpi_pcib_acpi.c	Tue Oct  9 20:07:24 2012	(r241385)
+++ head/sys/dev/acpica/acpi_pcib_acpi.c	Wed Oct 10 00:06:31 2012	(r241386)
@@ -502,7 +502,7 @@ acpi_pcib_map_msi(device_t pcib, device_
 	if (error)
 		return (error);
 
-	sc = device_get_softc(dev);
+	sc = device_get_softc(pcib);
 	if (sc->ap_addr == -1)
 		return (0);
 	/* XXX: Assumes all bridges are on bus 0. */