diff options
| author | Peter Maydell | 2016-05-12 15:34:35 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-05-12 15:34:35 +0200 |
| commit | f83b70f701923964aaf89e1203ddcef0dd48ed08 (patch) | |
| tree | 796c1e08c9a56a30028ecf75b601ca9b189e0158 /hw/usb/dev-mtp.c | |
| parent | Open 2.7 development tree (diff) | |
| parent | usb: Support compilation without poll.h (diff) | |
| download | qemu-f83b70f701923964aaf89e1203ddcef0dd48ed08.tar.gz qemu-f83b70f701923964aaf89e1203ddcef0dd48ed08.tar.xz qemu-f83b70f701923964aaf89e1203ddcef0dd48ed08.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20160511-1' into staging
usb: misc fixes
# gpg: Signature made Wed 11 May 2016 12:18:25 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
* remotes/kraxel/tags/pull-usb-20160511-1:
usb: Support compilation without poll.h
usb-mtp: fix usb_mtp_get_device_info so that libmtp on the guest doesn't complain
usb:xhci: no DMA on HC reset
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/usb/dev-mtp.c')
| -rw-r--r-- | hw/usb/dev-mtp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index bda84a64bd..1be85ae75a 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -788,8 +788,8 @@ static MTPData *usb_mtp_get_device_info(MTPState *s, MTPControl *c) trace_usb_mtp_op_get_device_info(s->dev.addr); usb_mtp_add_u16(d, 100); - usb_mtp_add_u32(d, 0xffffffff); - usb_mtp_add_u16(d, 0x0101); + usb_mtp_add_u32(d, 0x00000006); + usb_mtp_add_u16(d, 0x0064); usb_mtp_add_wstr(d, L""); usb_mtp_add_u16(d, 0x0000); |