diff options
| author | Michael S. Tsirkin | 2011-06-14 16:51:11 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin | 2011-06-15 17:27:15 +0200 |
| commit | befeac45d4d9afb587eca9a27d975db4a7950960 (patch) | |
| tree | aab24c856a3ea944e287d7f2591bb4bab6a56eb4 /hw/usb-ccid.c | |
| parent | print meaningful error message in case of --disable-vhost-net (diff) | |
| parent | configure: Detect and don't try to use older libcurl (diff) | |
| download | qemu-befeac45d4d9afb587eca9a27d975db4a7950960.tar.gz qemu-befeac45d4d9afb587eca9a27d975db4a7950960.tar.xz qemu-befeac45d4d9afb587eca9a27d975db4a7950960.zip | |
Merge remote-tracking branch 'origin/master' into pci
Conflicts:
hw/virtio-pci.c
Diffstat (limited to 'hw/usb-ccid.c')
| -rw-r--r-- | hw/usb-ccid.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/usb-ccid.c b/hw/usb-ccid.c index 079b4a2555..5b6878bea4 100644 --- a/hw/usb-ccid.c +++ b/hw/usb-ccid.c @@ -602,8 +602,8 @@ static void ccid_handle_reset(USBDevice *dev) ccid_reset(s); } -static int ccid_handle_control(USBDevice *dev, int request, int value, - int index, int length, uint8_t *data) +static int ccid_handle_control(USBDevice *dev, USBPacket *p, int request, + int value, int index, int length, uint8_t *data) { USBCCIDState *s = DO_UPCAST(USBCCIDState, dev, dev); int ret = 0; |