summary refs log tree commit diff stats
path: root/hw/usb/dev-uas.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-08-22 12:53:18 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2012-08-22 12:53:18 -0500
commitb6825cd79cdf3e2006c22bb8cfe47a0d7c5209fa (patch)
treeb020d9ce52ea7bc722797d25936dc2147c231a03 /hw/usb/dev-uas.c
parent99afc91d6ccdbe45258cff66fd0ce0142820c366 (diff)
parent47d073cc3b8ad4a3ef1dba7055b35a87fa4091ff (diff)
downloadfocaccia-qemu-b6825cd79cdf3e2006c22bb8cfe47a0d7c5209fa.tar.gz
focaccia-qemu-b6825cd79cdf3e2006c22bb8cfe47a0d7c5209fa.zip
Merge remote-tracking branch 'kraxel/usb.59' into staging
* kraxel/usb.59:
  ehci: Fix setting of halt bit from usbcmd register updates
  ehci: fix Interrupt Threshold Control implementation
  usb: update uas product id
  usb: async control xfer fixup
Diffstat (limited to 'hw/usb/dev-uas.c')
-rw-r--r--hw/usb/dev-uas.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/usb/dev-uas.c b/hw/usb/dev-uas.c
index 9b02ff48fa..b13eeba565 100644
--- a/hw/usb/dev-uas.c
+++ b/hw/usb/dev-uas.c
@@ -223,7 +223,7 @@ static const USBDescDevice desc_device_high = {
 static const USBDesc desc = {
     .id = {
         .idVendor          = 0x46f4, /* CRC16() of "QEMU" */
-        .idProduct         = 0x0002,
+        .idProduct         = 0x0003,
         .bcdDevice         = 0,
         .iManufacturer     = STR_MANUFACTURER,
         .iProduct          = STR_PRODUCT,