svn commit: r201680 - head/sys/dev/usb

[Andrew Thompson]

Author: thompsa
Date: Wed Jan  6 21:46:08 2010
New Revision: 201680
URL: http://svn.freebsd.org/changeset/base/201680

Log:
  scratch_size was incorrectly passed as language ID when retrieving the language
  ID table, this broke string retrieval on some devices.
  
  Submitted by:	Hans Petter Selasky
  Reported by:	Renato Botelho

Modified:
  head/sys/dev/usb/usb_device.c

Modified: head/sys/dev/usb/usb_device.c
==============================================================================
--- head/sys/dev/usb/usb_device.c	Wed Jan  6 21:45:30 2010	(r201679)
+++ head/sys/dev/usb/usb_device.c	Wed Jan  6 21:46:08 2010	(r201680)
@@ -1691,8 +1691,7 @@ usb_alloc_device(device_t parent_dev, st
 	    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;
 	}