From owner-svn-src-user@FreeBSD.ORG  Wed Sep 22 19:08:17 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C368C1065744;
	Wed, 22 Sep 2010 19:08:17 +0000 (UTC)
	(envelope-from weongyo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B459E8FC12;
	Wed, 22 Sep 2010 19:08:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8MJ8HBP039896;
	Wed, 22 Sep 2010 19:08:17 GMT (envelope-from weongyo@svn.freebsd.org)
Received: (from weongyo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8MJ8HNJ039894;
	Wed, 22 Sep 2010 19:08:17 GMT (envelope-from weongyo@svn.freebsd.org)
Message-Id: <201009221908.o8MJ8HNJ039894@svn.freebsd.org>
From: Weongyo Jeong <weongyo@FreeBSD.org>
Date: Wed, 22 Sep 2010 19:08:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r213010 - user/weongyo/usb/sys/dev/usb
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Sep 2010 19:08:17 -0000

Author: weongyo
Date: Wed Sep 22 19:08:17 2010
New Revision: 213010
URL: http://svn.freebsd.org/changeset/base/213010

Log:
  Returns with correct buffer length for a single page case.  In the
  previous there was no way to check the boundary because the length was
  always -1.

Modified:
  user/weongyo/usb/sys/dev/usb/usb_busdma.c

Modified: user/weongyo/usb/sys/dev/usb/usb_busdma.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/usb_busdma.c	Wed Sep 22 19:08:11 2010	(r213009)
+++ user/weongyo/usb/sys/dev/usb/usb_busdma.c	Wed Sep 22 19:08:17 2010	(r213010)
@@ -78,10 +78,11 @@ static void	usb_pc_common_mem_cb(void *,
  * been properly initialized !
  *------------------------------------------------------------------------*/
 void
-usbd_get_page(struct usb_page_cache *pc, usb_frlength_t offset,
+usbd_get_page(struct usb_page_cache *pc, usb_frlength_t offset0,
     struct usb_page_search *res)
 {
 	struct usb_page *page;
+	usb_frlength_t offset = offset0;
 	int index;
 
 #if USB_HAVE_BUSDMA
@@ -106,7 +107,10 @@ usbd_get_page(struct usb_page_cache *pc,
 			res->length = USB_PAGE_SIZE - offset;
 			res->physaddr = page[index].physaddr + offset;
 		} else {
-			res->length = 0 - 1;
+			USB_ASSERT(page[index].physlen > offset0,
+			    ("wrong offset (%zd/ %d)", page[index].physlen,
+			    offset0));
+			res->length = page[index].physlen - offset0;
 			res->physaddr = page[index].physaddr + offset;
 		}
 		if (!pc->buffer) {