From owner-svn-src-all@FreeBSD.ORG  Sat Feb 16 20:43:17 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])
 by hub.freebsd.org (Postfix) with ESMTP id 060C3FAE;
 Sat, 16 Feb 2013 20:43:17 +0000 (UTC) (envelope-from ian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E8BF8B5B;
 Sat, 16 Feb 2013 20:43:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1GKhGEs030869;
 Sat, 16 Feb 2013 20:43:16 GMT (envelope-from ian@svn.freebsd.org)
Received: (from ian@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1GKhG1e030867;
 Sat, 16 Feb 2013 20:43:16 GMT (envelope-from ian@svn.freebsd.org)
Message-Id: <201302162043.r1GKhG1e030867@svn.freebsd.org>
From: Ian Lepore <ian@FreeBSD.org>
Date: Sat, 16 Feb 2013 20:43:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r246881 - head/sys/arm/arm
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: Sat, 16 Feb 2013 20:43:17 -0000

Author: ian
Date: Sat Feb 16 20:43:16 2013
New Revision: 246881
URL: http://svnweb.freebsd.org/changeset/base/246881

Log:
  In _bus_dmamap_addseg(), the return value must be zero for error, or the size
  actually added to the segment (possibly smaller than the requested size if
  boundary crossings had to be avoided).

Modified:
  head/sys/arm/arm/busdma_machdep-v6.c
  head/sys/arm/arm/busdma_machdep.c

Modified: head/sys/arm/arm/busdma_machdep-v6.c
==============================================================================
--- head/sys/arm/arm/busdma_machdep-v6.c	Sat Feb 16 20:17:31 2013	(r246880)
+++ head/sys/arm/arm/busdma_machdep-v6.c	Sat Feb 16 20:43:16 2013	(r246881)
@@ -856,7 +856,7 @@ _bus_dmamap_addseg(bus_dma_tag_t dmat, b
 		    curaddr);
 		if (dr == NULL) {
 			_bus_dmamap_unload(dmat, map);
-			return (EINVAL);
+			return (0);
 		}
 		/*
 		 * In a valid DMA range.  Translate the physical

Modified: head/sys/arm/arm/busdma_machdep.c
==============================================================================
--- head/sys/arm/arm/busdma_machdep.c	Sat Feb 16 20:17:31 2013	(r246880)
+++ head/sys/arm/arm/busdma_machdep.c	Sat Feb 16 20:43:16 2013	(r246881)
@@ -913,7 +913,7 @@ _bus_dmamap_addseg(bus_dma_tag_t dmat, b
 		dr = _bus_dma_inrange(dmat->ranges, dmat->_nranges,
 		    curaddr);
 		if (dr == NULL)
-			return (EINVAL);
+			return (0);
 		/*
 		 * In a valid DMA range.  Translate the physical
 		 * memory address to an address in the DMA window.
@@ -935,12 +935,12 @@ _bus_dmamap_addseg(bus_dma_tag_t dmat, b
 		segs[seg].ds_len += sgsize;
 	} else {
 		if (++seg >= dmat->nsegments)
-			return (EFBIG);
+			return (0);
 		segs[seg].ds_addr = curaddr;
 		segs[seg].ds_len = sgsize;
 	}
 	*segp = seg;
-	return (0);
+	return (sgsize);
 }
 
 /*