From owner-p4-projects@FreeBSD.ORG  Tue Apr  5 20:40:09 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0CF69106564A; Tue,  5 Apr 2011 20:40:07 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DE4C71065672
	for <perforce@freebsd.org>; Tue,  5 Apr 2011 20:40:06 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id C5E4C8FC12
	for <perforce@freebsd.org>; Tue,  5 Apr 2011 20:40:06 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p35Ke63F030400
	for <perforce@freebsd.org>; Tue, 5 Apr 2011 20:40:06 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p35Ke6kK030397
	for perforce@freebsd.org; Tue, 5 Apr 2011 20:40:06 GMT
	(envelope-from jhb@freebsd.org)
Date: Tue, 5 Apr 2011 20:40:06 GMT
Message-Id: <201104052040.p35Ke6kK030397@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 191079 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Apr 2011 20:40:09 -0000

http://p4web.freebsd.org/@@191079?ac=10

Change 191079 by jhb@jhb_jhbbsd on 2011/04/05 20:39:44

	Bah, fix PCI-PCI bridge window allocation.

Affected files ...

.. //depot/projects/pci/sys/dev/pci/pci.c#12 edit

Differences ...

==== //depot/projects/pci/sys/dev/pci/pci.c#12 (text+ko) ====

@@ -3956,13 +3956,14 @@
 			case PCIR_IOBASEL_1:
 			case PCIR_MEMBASE_1:
 			case PCIR_PMBASEL_1:
-				break;
-			default:
-				goto bar;
+				/*
+				 * XXX: Should we bother creating a resource
+				 * list entry?
+				 */
+				return (bus_generic_alloc_resource(dev, child,
+				    type, rid, start, end, count, flags));
 			}
-			break;
 		}
-	bar:
 #endif
 		/* Reserve resources for this BAR if needed. */
 		rle = resource_list_find(rl, type, *rid);