From owner-p4-projects@FreeBSD.ORG  Wed Jan  6 18:10:20 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 795E910656A3; Wed,  6 Jan 2010 18:10:20 +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 3E5A11065697
	for <perforce@FreeBSD.org>; Wed,  6 Jan 2010 18:10:20 +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 2BECE8FC17
	for <perforce@FreeBSD.org>; Wed,  6 Jan 2010 18:10:20 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o06IAKXT011212
	for <perforce@FreeBSD.org>; Wed, 6 Jan 2010 18:10:20 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o06IAKVw011210
	for perforce@freebsd.org; Wed, 6 Jan 2010 18:10:20 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 6 Jan 2010 18:10:20 GMT
Message-Id: <201001061810.o06IAKVw011210@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>
Precedence: bulk
Cc: 
Subject: PERFORCE change 172667 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: Wed, 06 Jan 2010 18:10:20 -0000

http://p4web.freebsd.org/chv.cgi?CH=172667

Change 172667 by hselasky@hselasky_laptop001 on 2010/01/06 18:09:37

	
	USB core:
		- fix a parameter passing
		- "scratch_size" is incorrectly passed as language ID when
		retrieving the language ID table.
		- might fix retrieval of string descriptions
		- reported by Renato Botelho
		- patch by HPS

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_device.c#61 edit

Differences ...

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

@@ -1691,8 +1691,7 @@
 	    udev->ddesc.iSerialNumber) {
 		/* read out the language ID string */
 		err = usbd_req_get_string_desc(udev, NULL,
-		    (char *)scratch_ptr, 4, scratch_size,
-		    USB_LANGUAGE_TABLE);
+		    (char *)scratch_ptr, 4, 0, USB_LANGUAGE_TABLE);
 	} else {
 		err = USB_ERR_INVAL;
 	}