From owner-p4-projects@FreeBSD.ORG  Sat Feb  9 21:18:03 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C68F816A41A; Sat,  9 Feb 2008 21:18:02 +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 8B55116A417
	for <perforce@FreeBSD.org>; Sat,  9 Feb 2008 21:18:02 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7D47A13C44B
	for <perforce@FreeBSD.org>; Sat,  9 Feb 2008 21:18:02 +0000 (UTC)
	(envelope-from hselasky@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 m19LI2A9096550
	for <perforce@FreeBSD.org>; Sat, 9 Feb 2008 21:18:02 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m19LI2OY096547
	for perforce@freebsd.org; Sat, 9 Feb 2008 21:18:02 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 9 Feb 2008 21:18:02 GMT
Message-Id: <200802092118.m19LI2OY096547@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 135120 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: Sat, 09 Feb 2008 21:18:03 -0000

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

Change 135120 by hselasky@hselasky_laptop001 on 2008/02/09 21:17:58

	
	BUS-DMA fix for NetBSD.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#94 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#94 (text+ko) ====

@@ -2725,8 +2725,8 @@
 	    &ptr, BUS_DMA_WAITOK | BUS_DMA_COHERENT)) {
 		goto done_3;
 	}
-	if (bus_dmamap_create(tag, size, utag->n_seg, USB_PAGE_SIZE,
-	    0, BUS_DMA_WAITOK, &map)) {
+	if (bus_dmamap_create(tag, size, utag->n_seg, (align == 1) ?
+	    USB_PAGE_SIZE : size, 0, BUS_DMA_WAITOK, &map)) {
 		goto done_2;
 	}
 	if (bus_dmamap_load(tag, map, ptr, size, NULL,