From owner-p4-projects@FreeBSD.ORG  Wed Jul 25 03:56:28 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8838116A421; Wed, 25 Jul 2007 03:56:28 +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 5AF4816A417
	for <perforce@FreeBSD.org>; Wed, 25 Jul 2007 03:56:28 +0000 (UTC)
	(envelope-from loafier@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 518E613C457
	for <perforce@FreeBSD.org>; Wed, 25 Jul 2007 03:56:28 +0000 (UTC)
	(envelope-from loafier@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6P3uSSw044893
	for <perforce@FreeBSD.org>; Wed, 25 Jul 2007 03:56:28 GMT
	(envelope-from loafier@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6P3uSEI044890
	for perforce@freebsd.org; Wed, 25 Jul 2007 03:56:28 GMT
	(envelope-from loafier@FreeBSD.org)
Date: Wed, 25 Jul 2007 03:56:28 GMT
Message-Id: <200707250356.l6P3uSEI044890@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	loafier@FreeBSD.org using -f
From: Christopher Davis <loafier@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 124063 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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: Wed, 25 Jul 2007 03:56:28 -0000

http://perforce.freebsd.org/chv.cgi?CH=124063

Change 124063 by loafier@chrisdsoc on 2007/07/25 03:56:22

	Fix typos in cmi.c
	Compiles -- haven't tested

Affected files ...

.. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/sound/pci/cmi.c#3 edit

Differences ...

==== //depot/projects/soc2007/loafier_busalloc/src/sys/dev/sound/pci/cmi.c#3 (text+ko) ====

@@ -108,7 +108,7 @@
 
 static struct resource_spec cmi_res_spec[] = {
 	{SYS_RES_IOPORT, PCIR_BAR(0), RF_ACTIVE},
-	{SYS_RES_IRQ, 0, RF_ACTIVE | RF_SHARABLE},
+	{SYS_RES_IRQ, 0, RF_ACTIVE | RF_SHAREABLE},
 	{-1, 0, 0}
 };
 
@@ -884,7 +884,7 @@
 }
 
 static void
-cmi_destroy(device_t dev, sc_info *sc)
+cmi_destroy(device_t dev, struct sc_info *sc)
 {
 	if (!sc)
 		return;
@@ -893,7 +893,7 @@
 		bus_dma_tag_destroy(sc->parent_dmat);
 	if (sc->ih)
 		bus_teardown_intr(dev, sc->res[RES_IRQ], sc->ih);
-	bus_release_resources(dev, sc->res, cmi_res_spec);
+	bus_release_resources(dev, cmi_res_spec, sc->res);
 	if (sc->lock)
 		snd_mtxfree(sc->lock);
 
@@ -942,7 +942,7 @@
 	pci_enable_io(dev, SYS_RES_IOPORT);
 	sc->dev = dev;
 
-	if (bus_alloc_resources(dev, sc->res, cmi_res_spec) != 0)
+	if (bus_alloc_resources(dev, cmi_res_spec, sc->res) != 0)
 		goto bad;
 
 	if (0)