svn commit: r227401 - in head/sys/dev/usb: . controller

[Hans Petter Selasky]

Author: hselasky
Date: Wed Nov  9 18:48:36 2011
New Revision: 227401
URL: http://svn.freebsd.org/changeset/base/227401

Log:
  Fix size of USB 3.0 descriptor field.
  
  MFC after:	3 days

Modified:
  head/sys/dev/usb/controller/xhci.c
  head/sys/dev/usb/usb.h

Modified: head/sys/dev/usb/controller/xhci.c
==============================================================================
--- head/sys/dev/usb/controller/xhci.c	Wed Nov  9 18:26:19 2011	(r227400)
+++ head/sys/dev/usb/controller/xhci.c	Wed Nov  9 18:48:36 2011	(r227401)
@@ -2831,7 +2831,7 @@ struct xhci_bos_desc xhci_bosd = {
 		.bLength = sizeof(xhci_bosd.usb2extd),
 		.bDescriptorType = 1,
 		.bDevCapabilityType = 2,
-		.bmAttributes = 2,
+		.bmAttributes[0] = 2,
 	},
 	.usbdcd = {
 		.bLength = sizeof(xhci_bosd.usbdcd),

Modified: head/sys/dev/usb/usb.h
==============================================================================
--- head/sys/dev/usb/usb.h	Wed Nov  9 18:26:19 2011	(r227400)
+++ head/sys/dev/usb/usb.h	Wed Nov  9 18:48:36 2011	(r227401)
@@ -323,7 +323,7 @@ struct usb_devcap_usb2ext_descriptor {
 	uByte	bLength;
 	uByte	bDescriptorType;
 	uByte	bDevCapabilityType;
-	uByte	bmAttributes;
+	uDWord	bmAttributes;
 #define	USB_V2EXT_LPM 0x02
 } __packed;
 typedef struct usb_devcap_usb2ext_descriptor usb_devcap_usb2ext_descriptor_t;